D8243: copies: stop recording buggy file merge when new file overwrite an old one

marmoute added a comment. marmoute abandoned this revision. superseeded by D8392 REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8243/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8243 To: marmoute, #hg-r

D8243: copies: stop recording buggy file merge when new file overwrite an old one

marmoute added a comment. In D8243#125293 , @pulkit wrote: > D8392 is an attempt to fix the same issue by storing extra information in mergestate. The approach (storing in the merge state) is the one

D8243: copies: stop recording buggy file merge when new file overwrite an old one

pulkit added a comment. D8392 is an attempt to fix the same issue by storing extra information in mergestate. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8243/new/ REVISION DETAIL https://phab.mercurial-scm.

D8243: copies: stop recording buggy file merge when new file overwrite an old one

This revision now requires changes to proceed. durin42 added a comment. durin42 requested changes to this revision. Per irc checkin, we expect changes on this before review. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8243/new/ REVISION DETAIL ht

D8243: copies: stop recording buggy file merge when new file overwrite an old one

martinvonz added a comment. In D8243#124077 , @marmoute wrote: > In D8243#123559 , @martinvonz wrote: > >> This is pretty ugly and it doesn't seem that the next patch depends on it. You said yo

D8243: copies: stop recording buggy file merge when new file overwrite an old one

marmoute added a comment. In D8243#123559 , @martinvonz wrote: > This is pretty ugly and it doesn't seem that the next patch depends on it. You said you'll soon clean it up anyway, so I wonder if should just wait for the better solution inste

D8243: copies: stop recording buggy file merge when new file overwrite an old one

martinvonz added a comment. This is pretty ugly and it doesn't seem that the next patch depends on it. You said you'll soon clean it up anyway, so I wonder if should just wait for the better solution instead. It doesn't seem like this fixes a serious bug so we have to rush it. Thoughts? REP

D8243: copies: stop recording buggy file merge when new file overwrite an old one

martinvonz added a comment. FYI, I'd like to look at this patch, but I'm busy with other things right now (switching back and forth between browser tabs to delay the interview feedback that I'm actually supposed to write), so it will take a bit longer before I'll find time for this one. REP

D8243: copies: stop recording buggy file merge when new file overwrite an old one

marmoute updated this revision to Diff 20755. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D8243?vs=20595&id=20755 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8243/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8

D8243: copies: stop recording buggy file merge when new file overwrite an old one

marmoute added inline comments. INLINE COMMENTS > martinvonz wrote in localrepo.py:2868-2874 > Is this correct when grafting (not merging), such as when rebasing? Is it > worth having a test case for that? Is it even possible to get here in that > case? Maybe when rebasing a merge commit? I do

D8243: copies: stop recording buggy file merge when new file overwrite an old one

marmoute added a comment. marmoute retitled this revision from "copies: stop recoding buggy file merge when new file overwrite an old one" to "copies: stop recording buggy file merge when new file overwrite an old one". marmoute updated this revision to Diff 20595. series update after Martin