annotate tests/test-simple-update @ 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 4fc63e22b1fe
children 7e4843b7efd2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
544
3d4d5f2aba9a Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 485
diff changeset
1 #!/bin/sh
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
3 set -ex
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
4
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
5 mkdir test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
6 cd test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
7 echo foo>foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
8 hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
9 hg addremove
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
10 hg commit -t "1"
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
11 hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
12
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 350
diff changeset
13 hg clone . ../branch
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 350
diff changeset
14 cd ../branch
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
15 hg co
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
16 echo bar>>foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
17 hg commit -t "2"
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
18
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
19 cd ../test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
20 hg pull ../branch
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
21 hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
22 hg co
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
23 cat foo
485
c5705ab9cebd [PATCH] add clone command
mpm@selenic.com
parents: 350
diff changeset
24 hg manifest