Handling path conflicts

Kevin Bullock kbullock+mercurial at ringworld.org
Wed Aug 23 10:25:33 EDT 2017


> On Aug 23, 2017, at 06:05, Mark Thomas <mbthomas at fb.com> wrote:
> 
> Hi,
>  
> I’m looking at implementing path conflict handling, as the lack of it has caused a few bugs, including https://bz.mercurial-scm.org/show_bug.cgi?id=5628, and it is something that bites us here at Facebook from time to time.
>  
> I’ve written up my proposal on the wiki at https://www.mercurial-scm.org/wiki/PathConflictsPlan.  Since I’m new to Mercurial development, I’d appreciate any comments on this, particularly if there’s something that I’ve missed that’s going to affect what I’m proposing.

Thanks for writing that up. I haven't fully read thru it yet, but one quick question: Are the bugs listed in that page filed in the bug tracker <https://bz.mercurial-scm.org/> yet? Could you cross-link them with that page for reference when you get a chance?

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock



More information about the Mercurial-devel mailing list