https://bz.mercurial-scm.org/show_bug.cgi?id=5507
Bug ID: 5507
Summary: Merge fails with "assert sf not in data['diverge']"
Product: Mercurial
Version: 4.1
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: abys...@gmail.com
CC: mercurial-devel@mercurial-scm.org
I try to merge default to my branch with:
$ hg merge default
And I get the following stacktrace: https://bpaste.net/show/45075be0d7de
Can't produce some minimal test-case - the original repo is private.
If I disable copy trace via config, the merge is successful.
--
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
