evolve: comparison tests/test-evolve.t

equal deleted inserted replaced

-:f17a0f801e0b
+:a9c27df23129
 > unified = 0
 > [extensions]
 > hgext.rebase=
 > hgext.graphlog=
 > EOF
-$ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH
 $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext/evolve.py" >> $HGRCPATH
 $ mkcommit() {
 >    echo "$1" > "$1"
 >    hg add "$1"
 >    hg ci -m "add $1"
 test kill and immutable changeset
 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
 1 public stable
 $ hg kill 1
-cannot kill immutable changeset 7c3bad9141dc
+abort: Cannot obsolete immutable changeset: 7c3bad9141dc
+[255]
 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n'
 1 public stable
 test simple kill
 $ hg amend -c 2
 abort: cannot amend non ancestor changeset
 [255]
 $ hg amend --note 'french looks better'
-1 new unstables changesets
+1 new unstable changesets
 $ hg log
 6	feature-A: a nifty feature - test
 4	feature-B: another feature - test
 1	: a nifty feature - test
 0	: base - test
 $ hg up -q 0
 $ glog --hidden
 o  6:23409eba69a0@default(draft) a nifty feature
 |
-| o  5:e416e48b2742@default(secret) french looks better
+| x  5:e416e48b2742@default(draft) french looks better
 | |
 | | o  4:f8111a076f09@default(draft) another feature
 | |/
-| | o  3:524e478d4811@default(secret) fix spelling of Zwei
+| | x  3:524e478d4811@default(draft) fix spelling of Zwei
 | | |
-| | o  2:7b36850622b2@default(secret) another feature
+| | x  2:7b36850622b2@default(draft) another feature
 | |/
-| o  1:568a468b60fc@default(draft) a nifty feature
+| x  1:568a468b60fc@default(draft) a nifty feature
 |/
 @  0:e55e0562ee93@default(public) base
-$ hg debugsuccessors
+$ hg debugobsolete
-524e478d4811 f8111a076f09
+524e478d4811d405c8771e4c441de4483bdf8b33 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob)
-568a468b60fc 23409eba69a0
+7b36850622b2fd159fa30a4fb2a1edd2043b4a14 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob)
-7b36850622b2 f8111a076f09
+e416e48b27428695d00c2a2cc4a0b9619482e63f 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob)
-e416e48b2742 23409eba69a0
+568a468b60fc99a42d5d4ddbe181caff1eef308d 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob)
-$ hg stabilize
+$ hg evolve
 move:[4] another feature
 atop:[6] a nifty feature
 merging main-file-1
 $ hg log
 7	feature-B: another feature - test
 0	: base - test
 phase change turning obsolete changeset public issue a latecomer warning
 $ hg phase --public 7
-1 new latecomers changesets
+1 new latecomer changesets
+all solving latecomer troubled
+$ hg glog
+@  8	feature-B: another feature that rox - test
+|
+| o  7	: another feature - test
+|/
+o  6	feature-A: a nifty feature - test
+|
+o  0	: base - test
+$ hg evolve --any --traceback
+recreate:[8] another feature that rox
+atop:[7] another feature
+computing new diff
+commited as 8d77fa12ab0c
+$ hg glog
+@  9	feature-B: latecomer update to 5f4744038ed5: - test
+|
+o  7	: another feature - test
+|
+o  6	feature-A: a nifty feature - test
+|
+o  0	: base - test
+$ hg diff -r 9 -r 8
+$ hg diff -r 9^ -r 9
+diff --git a/main-file-1 b/main-file-1
+--- a/main-file-1
++++ b/main-file-1
+@@ -3,1 +3,1 @@
+-Zwei
++deux
+$ hg log -r 'latecomer()' # no more latecomer
 $ cd ..
 enable general delta
 | |
 | o  1:73d38bb17fd7@default(draft) add 1
 |/
 o  0:8685c6d34325@default(draft) add 0
-$ hg graft 3 -O
+$ hg graft -r3 -O
 grafting revision 3
-$ hg graft 1 -o 2
+$ hg graft -r1 -o 2
 grafting revision 1
 $ glog --hidden
 @  6:acb28cd497b7@default(draft) add 1
 |
 o  5:0b9e50c35132@default(draft) add 3
 |
 o  4:ce341209337f@default(draft) add 4
 |
-| o  3:0e84df4912da@default(secret) add 3
+| x  3:0e84df4912da@default(draft) add 3
 | |
-| o  2:db038628b9e5@default(secret) add 2
+| x  2:db038628b9e5@default(draft) add 2
 | |
 | o  1:73d38bb17fd7@default(draft) add 1
 |/
 o  0:8685c6d34325@default(draft) add 0
-$ hg debugsuccessors
+$ hg debugobsolete
-0e84df4912da 0b9e50c35132
+0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 {'date': '* *', 'user': 'test'} (glob)
-db038628b9e5 acb28cd497b7
+db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 {'date': '* *', 'user': 'test'} (glob)
 Test graft --continue
 $ hg up -qC 0
 $ echo 2 > 1
 $ hg graft --continue -O
 grafting revision 7
 $ glog --hidden
 @  8:920e58bb443b@default(draft) conflict
 |
-| o  7:a5bfd90a2f29@default(secret) conflict
+| x  7:a5bfd90a2f29@default(draft) conflict
 | |
 o |  6:acb28cd497b7@default(draft) add 1
 | |
 o |  5:0b9e50c35132@default(draft) add 3
 | |
 o |  4:ce341209337f@default(draft) add 4
 |/
-| o  3:0e84df4912da@default(secret) add 3
+| x  3:0e84df4912da@default(draft) add 3
 | |
-| o  2:db038628b9e5@default(secret) add 2
+| x  2:db038628b9e5@default(draft) add 2
 | |
 | o  1:73d38bb17fd7@default(draft) add 1
 |/
 o  0:8685c6d34325@default(draft) add 0
-$ hg debugsuccessors
+$ hg debugobsolete
-0e84df4912da 0b9e50c35132
+0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 {'date': '* *', 'user': 'test'} (glob)
-a5bfd90a2f29 920e58bb443b
+db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 {'date': '* *', 'user': 'test'} (glob)
-db038628b9e5 acb28cd497b7
+a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 {'date': '* *', 'user': 'test'} (glob)
-$ cd ..
+Test touch
+$ glog
+@  8:920e58bb443b@default(draft) conflict
+|
+o  6:acb28cd497b7@default(draft) add 1
+|
+o  5:0b9e50c35132@default(draft) add 3
+|
+o  4:ce341209337f@default(draft) add 4
+|
+| o  1:73d38bb17fd7@default(draft) add 1
+|/
+o  0:8685c6d34325@default(draft) add 0
+$ hg touch
+$ glog
+@  9:*@default(draft) conflict (glob)
+|
+o  6:acb28cd497b7@default(draft) add 1
+|
+o  5:0b9e50c35132@default(draft) add 3
+|
+o  4:ce341209337f@default(draft) add 4
+|
+| o  1:73d38bb17fd7@default(draft) add 1
+|/
+o  0:8685c6d34325@default(draft) add 0
+$ hg touch .
+$ glog
+@  10:*@default(draft) conflict (glob)
+|
+o  6:acb28cd497b7@default(draft) add 1
+|
+o  5:0b9e50c35132@default(draft) add 3
+|
+o  4:ce341209337f@default(draft) add 4
+|
+| o  1:73d38bb17fd7@default(draft) add 1
+|/
+o  0:8685c6d34325@default(draft) add 0
+Test fold
+$ hg fold 6::10
+2 changesets folded
+$ glog
+@  11:*@default(draft) add 1 (glob)
+|
+o  5:0b9e50c35132@default(draft) add 3
+|
+o  4:ce341209337f@default(draft) add 4
+|
+| o  1:73d38bb17fd7@default(draft) add 1
+|/
+o  0:8685c6d34325@default(draft) add 0
+$ hg log -r 11 --template '{desc}\n'
+add 1
+***
+conflict
+Test olog
+$ hg olog
+6	: add 1 - test
+10	: conflict - test

branch	stable
changeset 499	a9c27df23129
parent 492	7ecd41520dae
child 549	b047e9417d96