[MERGE] bzr rm should delete the working file (Bug #82602)

[Wouter van Heyst]

On Thu, Apr 12, 2007 at 04:01:04PM -0400, Aaron Bentley wrote:
> Wouter van Heyst wrote:
> > On Thu, Apr 12, 2007 at 01:10:34PM -0400, Aaron Bentley wrote:
> 
> >> I should mention that this does not match the behavior of revert.
> >> Revert will also delete files if their contents were introduced by a
> >> merge.  I am not sure whether this is desirable, but I figure we should
> >> discuss that.
> > 
> > I frequently use it after a trial merge and I want to get back to the
> > last commited inventory. 
> 
> To be clear, you use "remove/rm" after a trial merge?

I might have misunderstood you, I use `bzr revert` after a trial merge,
which I think is desirable.

Wouter van Heyst