tests/test-unrelated-pull.out
author Alecs King <alecsk@gmail.com>
Mon, 04 Jul 2005 12:15:44 -0800
changeset 612 9cd745437269
parent 579 ffeb2c3a1966
child 775 122449dd89db
child 793 445970ccf57a
permissions -rw-r--r--
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: # HG changeset patch # User Alecs King <alecsk@gmail.com> 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().

pulling from ../a
searching for changes
warning: pulling from an unrelated repository!
adding changesets
adding manifests
adding file revisions
modified 1 files, added 1 changesets and 1 new revisions
(run 'hg update' to get a working copy)
changeset:   1:9a79c33a9db37480e40fbd2a65d62ebd2a3c441c
tag:         tip
user:        a
date:        Thu Jan  1 00:00:00 1970
summary:     a

changeset:   0:01f8062b2de51c0fa6428c5db1d1b3ea780189df
user:        b
date:        Thu Jan  1 00:00:00 1970
summary:     b