[Bug 348474] Re: Reverting a merge and remerging casuse backtrace

[James Westby]

bzr arguments: [u'revert', u'.']

This happens because there are still pending merges in the tree when you merge
again, and that leads to this confusion.

If you use plain "bzr revert" without the "." this won't happen.

There are a couple of things going on here:

  * merge checks if there are uncommitted changes in the working tree. Should
     this be extended to check for pending merges?

  * The error probably shouldn't happen, or at least be more clear about what is
     wrong.

Thanks,

James


** Changed in: bazaar (Ubuntu)
   Importance: Undecided => Medium

** Changed in: bazaar (Ubuntu)
       Status: New => Confirmed

** Summary changed:

- Reverting a merge and remerging casuse backtrace
+ Reverting the tree after a merge and remerging casuse backtrace

** Summary changed:

- Reverting the tree after a merge and remerging casuse backtrace
+ Reverting the tree after a merge and remerging causes a backtrace

-- 
Reverting the tree after a merge and remerging causes a backtrace
https://bugs.launchpad.net/bugs/348474
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.

-- 
ubuntu-bugs mailing list
ubuntu-bugs at lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs