https://bz.mercurial-scm.org/show_bug.cgi?id=6068
Bug ID: 6068 Summary: Merge conflict when doing `hg shelve --interactive` Product: Mercurial Version: unspecified Hardware: PC OS: Linux Status: UNCONFIRMED Severity: feature Priority: wish Component: shelve Assignee: bugzi...@mercurial-scm.org Reporter: h...@pewpew.net CC: mercurial-devel@mercurial-scm.org $ hg init $ cat > foo <<EOF > r0 line 1 > r0 line 2 > r0 line -2 > r0 line -1 > EOF $ hg ci -qAm r0 $ cat > foo <<EOF > r0 line 1 > r0 line 2 > dont shelve this 1 > dont shelve this 2 > shelve this 1 > shelve this 2 > r0 line -2 > r0 line -1 > EOF Now, try running `hg shelve -i` and (curses interface): unmark the "dont shelve this" lines (text interface): inspect the file, 'e' to edit, remove the "+dont shelve this" lines You'll get a merge conflict: $ cat foo r0 line 1 r0 line 2 <<<<<<< working copy: 6471987d4ca5 - shelve: changes to: r0 dont shelve this 1 dont shelve this 2 shelve this 1 shelve this 2 ||||||| base shelve this 1 shelve this 2 ======= >>>>>>> destination: ff8755499cc3 - spectral: r0 r0 line -2 r0 line -1 -- You are receiving this mail because: You are on the CC list for the bug. _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel