Two things that bzr makes hard :-(

[Ian Clatworthy]

Robert Collins wrote:
> On Mon, 2008-06-02 at 16:46 +0100, Scott James Remnant wrote:
>> I have two pretty common operations that bzr makes hard work, and
>> kittens die in the process.
>>
>>
>>  1) "What did they change?"

> This is an interesting case. You can of course do 
> $ bzr merge
> $ bzr diff 
> $ bzr revert
> :)

FWIW, that's exactly what I do when reviewing changes. I keep
a 'review' branch around, pull --overwrite to bring it up to date,
then:

  bzr merge ../path-to-merge-directive
  (fix any conflicts)
  bzr diff --using meld ...
  ...
  bzr revert

Works nicely for me.

> $ bzr update -r 
> is the conceptual command.
> 
> bug https://bugs.edge.launchpad.net/bzr/+bug/45719 lists this.

I'm pretty sure there's a patch for this. It wasn't merged
into bzr.dev because more tests were requested during the review.

Ian C.