Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge2.out @ 612:9cd745437269
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().
author | Alecs King <alecsk@gmail.com> |
---|---|
date | Mon, 04 Jul 2005 12:15:44 -0800 |
parents | feadc9697b43 |
children | 7e4843b7efd2 |
rev | line source |
---|---|
409 | 1 + mkdir t |
2 + cd t | |
3 + hg init | |
4 + echo This is file a1 | |
5 + hg add a | |
6 + hg commit -t 'commit #0' -d '0 0' -u user | |
7 + echo This is file b1 | |
8 + hg add b | |
9 + hg commit -t 'commit #1' -d '0 0' -u user | |
10 + rm b | |
11 + hg update 0 | |
12 + echo This is file b2 | |
13 + hg add b | |
14 + hg commit -t 'commit #2' -d '0 0' -u user | |
15 + cd .. | |
16 + /bin/rm -rf t | |
17 + mkdir t | |
18 + cd t | |
19 + hg init | |
20 + echo This is file a1 | |
21 + hg add a | |
22 + hg commit -t 'commit #0' -d '0 0' -u user | |
23 + echo This is file b1 | |
24 + hg add b | |
25 + hg commit -t 'commit #1' -d '0 0' -u user | |
26 + rm b | |
27 + hg update 0 | |
28 + echo This is file b2 | |
29 + hg commit -A -t 'commit #2' -d '0 0' -u user | |
30 + cd .. | |
31 + /bin/rm -rf t | |
32 + mkdir t | |
33 + cd t | |
34 + hg init | |
35 + echo This is file a1 | |
36 + hg add a | |
37 + hg commit -t 'commit #0' -d '0 0' -u user | |
38 + echo This is file b1 | |
39 + hg add b | |
40 + hg commit -t 'commit #1' -d '0 0' -u user | |
41 + rm b | |
42 + hg remove b | |
43 + hg update 0 | |
44 + echo This is file b2 | |
45 + hg commit -A -t 'commit #2' -d '0 0' -u user | |
46 + cd .. | |
47 + /bin/rm -rf t |