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

[James Westby]

On Wed, 2009-03-25 at 15:30 +0000, Ted Gould wrote:
> On Wed, 2009-03-25 at 15:12 +0000, James Westby wrote:
> > If you use plain "bzr revert" without the "." this won't happen.
> 
> Wow, thanks for the tip!
> 
> I think that first there shouldn't be a stack trace, that's always bad
> usability.  But two "revert ." should give a message about keeping the
> merge record.  I didn't realize that there was a difference between the
> two types of merge, but now that I know it's a useful distinction.
> There should be a way to discover it.

Yeah, it's actually a useful facility. If you then commit it records 
the merge, but with no changes, so that next time you merge you just 
merge the new things in the other branch.

I think that while messages for normal behaviour aren't always a good
thing it may be worth adding in this case. For one thing it may make
this functionality slightly more discoverable.

Thanks,

James

-- 
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