https://bz.mercurial-scm.org/show_bug.cgi?id=6037
Bug ID: 6037
Summary: `hg grab` loses added files when there are merge
conflicts
Product: Mercurial
Version: unspecified
Hardware: PC
OS: Mac OS
Status: UNCONFIRMED
Severity: feature
Priority: wish
Component: evolution
Assignee: bugzi...@mercurial-scm.org
Reporter: jandemo...@gmail.com
CC: mercurial-devel@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
I like the `grab` command a lot, but sometimes it removes added files when
there are merge conflicts. I can reproduce with the comamnds below in an empty
directory. test2.txt is an untracked file at the end.
hg init .
echo "foo" > test.txt
hg add test.txt
hg commit -m "Add file"
echo "bar" > test2.txt
hg add test2.txt
echo "foo1" > test.txt
hg commit -m "Change test.txt, add test2.txt"
echo "foo2" > test.txt
hg commit -m "Change test.txt"
hg up -r 0
hg grab -r 2
hg resolve -t internal:other --all
hg grab --continue
hg grab -r 1
hg resolve -t internal:other --all
hg grab --continue
hg status
--
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
