Mercurial > hg
comparison tests/test-phases-exchange.t @ 20306:fe8e254c7ad6 stable
merge default into stable for 2.9 code freeze
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 21 Jan 2014 14:30:06 -0600 |
parents | aa9385f983fa |
children | b396032e1bb8 |
comparison
equal
deleted
inserted
replaced
20213:8c69c69dbcd2 | 20306:fe8e254c7ad6 |
---|---|
1 $ "$TESTDIR/hghave" killdaemons || exit 80 | 1 $ "$TESTDIR/hghave" killdaemons || exit 80 |
2 | 2 |
3 $ cat >> $HGRCPATH <<EOF | |
4 > [extensions] | |
5 > graphlog= | |
6 > EOF | |
7 $ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; } | 3 $ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; } |
8 | 4 |
9 $ mkcommit() { | 5 $ mkcommit() { |
10 > echo "$1" > "$1" | 6 > echo "$1" > "$1" |
11 > hg add "$1" | 7 > hg add "$1" |
397 (end insertion) | 393 (end insertion) |
398 | 394 |
399 | 395 |
400 initial setup | 396 initial setup |
401 | 397 |
402 $ hg glog # of alpha | 398 $ hg log -G # of alpha |
403 o changeset: 6:145e75495359 | 399 o changeset: 6:145e75495359 |
404 | tag: tip | 400 | tag: tip |
405 | user: test | 401 | user: test |
406 | date: Thu Jan 01 00:00:00 1970 +0000 | 402 | date: Thu Jan 01 00:00:00 1970 +0000 |
407 | summary: n-B | 403 | summary: n-B |
1060 |/ | 1056 |/ |
1061 o 1 public a-B - 548a3d25dbf0 | 1057 o 1 public a-B - 548a3d25dbf0 |
1062 | | 1058 | |
1063 o 0 public a-A - 054250a37db4 | 1059 o 0 public a-A - 054250a37db4 |
1064 | 1060 |
1065 #if unix-permissions | 1061 #if unix-permissions no-root |
1066 | 1062 |
1067 Pushing From an unlockable repo | 1063 Pushing From an unlockable repo |
1068 -------------------------------- | 1064 -------------------------------- |
1069 (issue3684) | 1065 (issue3684) |
1070 | 1066 |