Mercurial > hg > mutable-history
changeset 347:f4302a2079f4
tests: update graphlog output after hg@2e13c1bd34dc
2e13c1bd34dc displays obsolete changesets as 'x' instead of 'o'.
author | Patrick Mezard <patrick@mezard.eu> |
---|---|
date | Sun, 08 Jul 2012 19:02:36 +0200 |
parents | 6b92f8d5ae58 |
children | 631cdf4295bc |
files | docs/tutorials/tutorial.t tests/test-evolve.t tests/test-obsolete-push.t tests/test-obsolete-rebase.t tests/test-obsolete.t tests/test-stabilize-order.t tests/test-stabilize-result.t tests/test-uncommit.t |
diffstat | 8 files changed, 40 insertions(+), 40 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/tutorials/tutorial.t +++ b/docs/tutorials/tutorial.t @@ -585,7 +585,7 @@ | | @ ffa278c50818 (draft): bathroom stuff | | - o | 8a79ae8b029e (draft): bathroom stuff + x | 8a79ae8b029e (draft): bathroom stuff |/ o a2fccc2e7b08 (public): SPAM SPAM | @@ -723,7 +723,7 @@ $ hg log -G o ae45c0c3092a (draft): SPAM SPAM SPAM | - o 437efbcaf700 (draft): animals + x 437efbcaf700 (draft): animals | @ ffa278c50818 (draft): bathroom stuff |
--- a/tests/test-evolve.t +++ b/tests/test-evolve.t @@ -231,15 +231,15 @@ $ glog --hidden o 6:23409eba69a0@default(draft) a nifty feature | - | o 5:e416e48b2742@default(secret) french looks better + | x 5:e416e48b2742@default(secret) french looks better | | | | o 4:f8111a076f09@default(draft) another feature | |/ - | | o 3:524e478d4811@default(secret) fix spelling of Zwei + | | x 3:524e478d4811@default(secret) fix spelling of Zwei | | | - | | o 2:7b36850622b2@default(secret) another feature + | | x 2:7b36850622b2@default(secret) another feature | |/ - | o 1:568a468b60fc@default(draft) a nifty feature + | x 1:568a468b60fc@default(draft) a nifty feature |/ @ 0:e55e0562ee93@default(draft) base
--- a/tests/test-obsolete-push.t +++ b/tests/test-obsolete-push.t @@ -32,9 +32,9 @@ $ glog --hidden @ 2:244232c2222a@default(unstable/secret) C | - | o 1:6c81ed0049f8@default(extinct/secret) B + | x 1:6c81ed0049f8@default(extinct/secret) B |/ - o 0:1994f17a630e@default(suspended/secret) A + x 0:1994f17a630e@default(suspended/secret) A $ hg init ../clone $ cat > ../clone/.hg/hgrc <<EOF
--- a/tests/test-obsolete-rebase.t +++ b/tests/test-obsolete-rebase.t @@ -70,7 +70,7 @@ $ glog --hidden @ 4:9c5494949763@default(draft) adde | - | o 3:98e4a024635e@default(secret) adde + | x 3:98e4a024635e@default(secret) adde | | | o 2:102a90ea7b4a@default(draft) addb | | @@ -92,11 +92,11 @@ $ hg ci -m changea $ hg rebase -d 1 $ glog --hidden - o 5:4e322f7ce8e3@foo(secret) changea + x 5:4e322f7ce8e3@foo(secret) changea | | o 4:9c5494949763@default(draft) adde | | - | | o 3:98e4a024635e@default(secret) adde + | | x 3:98e4a024635e@default(secret) adde | | | +---o 2:102a90ea7b4a@default(draft) addb | | @@ -123,15 +123,15 @@ $ glog --hidden @ 8:a7773ffa7edc@default(draft) Collapsed revision | - | o 7:03f31481307a@default(secret) changec + | x 7:03f31481307a@default(secret) changec | | - | o 6:076e9b2ffbe1@default(secret) addc + | x 6:076e9b2ffbe1@default(secret) addc | | - | | o 5:4e322f7ce8e3@foo(secret) changea + | | x 5:4e322f7ce8e3@foo(secret) changea | |/ +---o 4:9c5494949763@default(draft) adde | | - | | o 3:98e4a024635e@default(secret) adde + | | x 3:98e4a024635e@default(secret) adde | | | | | o 2:102a90ea7b4a@default(draft) addb | |/ @@ -182,21 +182,21 @@ | o 11:03f165c84ea8@default(draft) addd | - | o 10:4b9d80f48523@default(secret) appendab + | x 10:4b9d80f48523@default(secret) appendab | | - | o 9:a31943eabc43@default(secret) addd + | x 9:a31943eabc43@default(secret) addd | | +---o 8:a7773ffa7edc@default(draft) Collapsed revision | | - | | o 7:03f31481307a@default(secret) changec + | | x 7:03f31481307a@default(secret) changec | | | - | | o 6:076e9b2ffbe1@default(secret) addc + | | x 6:076e9b2ffbe1@default(secret) addc | |/ - | | o 5:4e322f7ce8e3@foo(secret) changea + | | x 5:4e322f7ce8e3@foo(secret) changea | |/ +---o 4:9c5494949763@default(draft) adde | | - | | o 3:98e4a024635e@default(secret) adde + | | x 3:98e4a024635e@default(secret) adde | | | | | o 2:102a90ea7b4a@default(draft) addb | |/
--- a/tests/test-obsolete.t +++ b/tests/test-obsolete.t @@ -140,9 +140,9 @@ | | o 4:725c380fe99b@default(stable/draft) add obsol_c' | | - o | 3:0d3f46688ccc@default(suspended/secret) add obsol_c + x | 3:0d3f46688ccc@default(suspended/secret) add obsol_c |/ - | o 2:4538525df7e2@default(extinct/secret) add c + | x 2:4538525df7e2@default(extinct/secret) add c |/ o 1:7c3bad9141dc@default(stable/draft) add b | @@ -429,7 +429,7 @@ | | o 4 - 725c380fe99b | | - o | 3 - 0d3f46688ccc + x | 3 - 0d3f46688ccc |/ o 1 - 7c3bad9141dc | @@ -437,21 +437,21 @@ $ hg glog --template='{rev} - {node|short}\n' `(hg --version | grep -q 'version 2.1') || echo '--hidden'` - o 9 - 83b5778897ad + x 9 - 83b5778897ad o 8 - 159dfc9fa5d3 | - | o 7 - 909a0fb57e5d + | x 7 - 909a0fb57e5d |/ - | o 6 - 95de7fc6918d + | x 6 - 95de7fc6918d |/ - | o 5 - a7a6f2b5d8a5 + | x 5 - a7a6f2b5d8a5 |/ | o 4 - 725c380fe99b | | - o | 3 - 0d3f46688ccc + x | 3 - 0d3f46688ccc |/ - | o 2 - 4538525df7e2 + | x 2 - 4538525df7e2 |/ o 1 - 7c3bad9141dc |
--- a/tests/test-stabilize-order.t +++ b/tests/test-stabilize-order.t @@ -54,9 +54,9 @@ | | | | o 3:7a7552255fb5@default(draft) addc | | | - | | o 2:ef23d6ef94d6@default(draft) addb + | | x 2:ef23d6ef94d6@default(draft) addb | |/ - | o 1:93418d2c0979@default(draft) adda + | x 1:93418d2c0979@default(draft) adda |/ o 0:c471ef929e6a@default(draft) addroot @@ -77,9 +77,9 @@ | | o 3:7a7552255fb5@default(draft) addc | | - | o 2:ef23d6ef94d6@default(draft) addb + | x 2:ef23d6ef94d6@default(draft) addb | | - | o 1:93418d2c0979@default(draft) adda + | x 1:93418d2c0979@default(draft) adda |/ o 0:c471ef929e6a@default(draft) addroot @@ -135,7 +135,7 @@ | | o 9:5e819fbb0d27@default(draft) addc | | - | o 8:6bf44048e43f@default(draft) addb + | x 8:6bf44048e43f@default(draft) addb |/ o 7:f5ff10856e5a@default(draft) adda |
--- a/tests/test-stabilize-result.t +++ b/tests/test-stabilize-result.t @@ -37,11 +37,11 @@ $ glog --hidden @ 4:1447e1c4828d@default(draft) bk:[changea] changea | - | o 3:41ad4fe8c795@default(secret) bk:[] amends 102a90ea7b4a3361e4082ed620918c261189a36a + | x 3:41ad4fe8c795@default(secret) bk:[] amends 102a90ea7b4a3361e4082ed620918c261189a36a | | - | | o 2:cce2c55b8965@default(secret) bk:[] changea + | | x 2:cce2c55b8965@default(secret) bk:[] changea | |/ - | o 1:102a90ea7b4a@default(secret) bk:[] addb + | x 1:102a90ea7b4a@default(secret) bk:[] addb |/ o 0:07f494440405@default(draft) bk:[] adda
--- a/tests/test-uncommit.t +++ b/tests/test-uncommit.t @@ -220,7 +220,7 @@ $ glog --hidden @ 4:e8db4aa611f6@bar(stable/draft) touncommit | - | o 3:5eb72dbe0cb4@bar(extinct/secret) touncommit + | x 3:5eb72dbe0cb4@bar(extinct/secret) touncommit |/ o 2:f63b90038565@default(stable/draft) merge |\ @@ -266,7 +266,7 @@ | | o 4:e8db4aa611f6@bar(stable/draft) touncommit |/ - | o 3:5eb72dbe0cb4@bar(extinct/secret) touncommit + | x 3:5eb72dbe0cb4@bar(extinct/secret) touncommit |/ o 2:f63b90038565@default(stable/draft) merge |\