[Bug 5428] New: rebase should "rebase" obsmarkers to avoid divergence
bugzilla at mercurial-scm.org
bugzilla at mercurial-scm.org
Thu Nov 17 18:31:23 UTC 2016
https://bz.mercurial-scm.org/show_bug.cgi?id=5428
Bug ID: 5428
Summary: rebase should "rebase" obsmarkers to avoid divergence
Product: Mercurial
Version: default branch
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: rebase
Assignee: bugzilla at selenic.com
Reporter: arcppzju+hgbug at gmail.com
CC: mercurial-devel at selenic.com
Before rebase:
o c5f1a8 quark draft/rebase
| rebase: calculate ancestors for --base separately (issue5420)
|
| o bb3f84 quark rebase unstable
| | warn
| |
| x f35e20 quark
|/ rebase: calculate ancestors for --base separately (issue5420)
|
o 3f18df quark
| drawdag: update test repos by drawing the changelog DAG in ASCII
After rebase -s 3f18df -d remote/@ --config experimental.allowdivergence=1:
o 5fbcf9 quark divergent
| rebase: calculate ancestors for --base separately (issue5420)
|
| o ad6aa4 quark rebase
| | warn
| |
| o 976883 quark divergent
|/ rebase: calculate ancestors for --base separately (issue5420)
|
o ee473a quark
| drawdag: update test repos by drawing the changelog DAG in ASCII
I'd expect an extra obs marker of "976883 is obsoleted by 5fbcf9" is created so
no divergent will be introduced.
This may be related to bug4849 but it seems they are not the same thing.
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list