Code review comment for lp:~mbp/bzr/help

Revision history for this message
Wouter van Heyst (larstiq) wrote :

On Fri, May 20, 2011 at 16:01:42 -0000, Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/help into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~mbp/bzr/help/+merge/61793
>
> Better help for update and revert. (Thanks Maritza.)

I like the new text! It has a couple of mentions of 'basis revision',
which might not be clear. Is there user explanation for that somewhere?
A quick grep doesn't find it, but perhaps I worry overly.

update has:

> + The new basis revision is by default the tip of the tree's branch, or
...

> + Any uncommitted changes in the working tree relative to the current basis
> + revision are carried across, by merging them into the new basis revision.

and revert:
> + Revert changes files from a working tree (or by default the whole tree) to be
> + the same as the files in the basis revision of the tree (or whatever revision
> + is specified with -r.)

Wouter van Heyst

« Back to merge proposal