bzr rebase inserts bogus merge info
Bug #1016619 reported by
Phillip Susi
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| bzr-rewrite |
New
|
Undecided
|
Unassigned | ||
| bzr-rewrite (Ubuntu) |
New
|
Undecided
|
Unassigned | ||
Bug Description
Take a branch with 5 revisions. You realize rev 2 had an error you want to correct.
bzr branch . fix
cd fix
bzr uncommit -r 2
bzr revert
bzr uncommit
edit
bzr commit
Now you have fixed the error in rev2 and want to rebase revs 3-5 on top of the new, corrected rev2:
cd ..
bzr rebase -r 3.. fix
This replays revs 3, 4, 5 on top of the new rev2. If you look at the log, it does indeed show the new corrected rev2, HOWEVER, rev3 shows that it merged the OLD rev2, which is nonsense.
To post a comment you must log in.
