tests/test-merge5.out

On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
# HG changeset patch
# User Alecs King <[e-mail]>

On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
> On Sun, Jul 03, 2005 at 12:49:27AM +0800, Alecs King wrote:
> > Hg is really very nice.  The only feature i miss from git is the
> > whatchanged -p, which shows a diff along with a changeset.
> > python before, i just dig into the mercurial/commands.py a while and
> > see what diff(), dodiff(), export(), show_changeset(), log() would
> > normally do.  There might be one thing or two missed or wrong.  But here
> > it is: a '-d' option to 'hg log' showing the diff info.  You can use 'hg
> > log -d' to show the whole history with the diff or 'hg log -d <file>' to
> > show that info of a particular file.  And also works with the '-r'
> > option. 
> 
> Let's use -p. We're going to be combining the global and per command
> switch namespace shortly and the global -p will disappear.

Okay. '-d' changed to '-p'. Just like 'whatchanged -p', now we have
'hg log -p'.

> Also, the argument list for show_changeset is getting a bit unwieldy.

This time i remain show_changeset untouched at all.  Only changed some
bits of log().

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b22
+ hg commit '-tcomment #1' -d '0 0' -u user
+ hg update 0
+ rm b
+ hg commit -A '-tcomment #2' -d '0 0' -u user
+ yes k
+ hg update 1
this update spans a branch affecting the following files:
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0