[MERGE] Fix bug 249919, added change example to diff help.

[Andrew Bennetts]

Andy Kilner wrote:
> Fix bug 249919, added change example to diff help.

bb:tweak

> # Bazaar merge directive format 2 (Bazaar 0.90)
> # revision_id: akilner at nutty-20090704151311-fekwgq1yuh7c6wan
> # target_branch: lp:~gnublade/bzr/bzr.dev

This target_branch isn't right... you probably need to set public_branch for
your local bzr.dev mirror in your locations.conf.  e.g. I have (lightly
edited):

[/home/andrew/code/bzr/bzr.dev]
public_branch = http://bazaar-vcs.org/bzr/bzr.dev
public_branch:policy = norecurse
child_submit_to = merge at code.launchpad.net

(I submit my merge requests to Launchpad, but you could just as easily point
to the Bazaar mailing list here.)

> === modified file 'bzrlib/builtins.py'
> --- bzrlib/builtins.py	2009-07-02 11:37:38 +0000
> +++ bzrlib/builtins.py	2009-07-04 15:13:11 +0000
> @@ -1833,6 +1833,10 @@
>  
>              bzr diff -r1..2 xxx
>  
> +        Show the differences introduced in a particular revision::
> +
> +            bzr diff -c2
> +

I'm ambivalent about this.  It's a very useful command (I frequently use
diff -c myself) and worth highlighting, but I think “bzr help diff” is
already too long.  It already scrolls off a fullscreened terminal window on
my laptop — and usually the parts I want to read are exactly the parts that
scrolled offscreen (the options reference).  Perhaps we should split these
examples into a “diff-examples” help topic, and just point to that from the
help for the diff command?

So I don't really object to this patch, but I'd be happier with creating a
diff-examples topic.

-Andrew.