On 2021/01/20 14:24, Nathan Hartman wrote: > [cc -= users] > > On Tue, Jan 19, 2021 at 10:50 PM Yasuhito FUTATSUKI > <futat...@yf.bsdclub.org> wrote:
<snip> > It looks like a simple copy-paste mistake when the new macros were > introduced in r1687415. > > Two more fixes are needed: a similar pattern also appears twice in > svn_cl__append_conflict_info_xml() (see below). Sure. My patch covered only tree conflict case. It seems there also exists the same problem in text conflict case and props conflict case. > I did *NOT* test the following yet. Also, before committing any fix, I > would like to add a regression test based on the OP's repro script. Although I didn't tested the text conflict case and props conflict case, your patch looks good, as far as I read. Cheers, -- Yasuhito FUTATSUKI <futat...@yf.bsclub.org>
