Public bug reported:

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.

** Affects: bzr-rewrite (Ubuntu)
     Importance: Undecided
         Status: New

-- 
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1016619

Title:
  bzr rebase inserts bogus merge info

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/bzr-rewrite/+bug/1016619/+subscriptions

-- 
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

Reply via email to