[Bug 6206] New: In-memory rebase doesn’t work correctly with subrepositories
mercurial-bugs at mercurial-scm.org
mercurial-bugs at mercurial-scm.org
Wed Oct 23 22:03:30 UTC 2019
https://bz.mercurial-scm.org/show_bug.cgi?id=6206
Bug ID: 6206
Summary: In-memory rebase doesnât work correctly with
subrepositories
Product: Mercurial
Version: 5.1
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: rebase
Assignee: bugzilla at mercurial-scm.org
Reporter: me at manueljacob.de
CC: mercurial-devel at mercurial-scm.org
Python Version: 2.7
$ hg init test-subrepo
$ cd test-subrepo
$ hg init sub1; echo 'sub1 = sub1' > .hgsub; hg add .hgsub; hg ci -m sub1
$ hg update null --quiet
$ hg init sub2; echo 'sub2 = sub2' > .hgsub; hg add .hgsub; hg ci -m sub2
created new head
$ hg rebase -d 0 -s 1
rebasing 1:8ba70c500d30 "sub2" (tip)
merging .hgsub
hit merge conflicts; re-running rebase without in-memory merge
abort: uncommitted changes
[255]
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list