evolve: comparison tests/test-evolve.t

equal deleted inserted replaced

-:c912eaf29eec
+:a0c39e8d2c29
 $ hg up
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ cd ..
-Test graft --obsolete/--old-obsolete
+Normal testing
 $ hg init test-graft
 $ cd test-graft
 $ mkcommit 0
 $ mkcommit 1
 | |
 | o  1:73d38bb17fd7@default(draft) add 1
 |/
 o  0:8685c6d34325@default(draft) add 0
-$ hg graft -r3 -O
+$ hg grab -r3
-grafting 3:0e84df4912da "add 3"
+grabbing 3:0e84df4912da "add 3"
-$ hg graft -r1 -o 2
+$ hg graft -r1
 grafting 1:73d38bb17fd7 "add 1"
+$ hg prune -r2 --succ .
+1 changesets pruned
 $ glog --hidden
-@  6:acb28cd497b7@default(draft) add 1
+@  6:417185465d2c@default(draft) add 1
 |
-o  5:0b9e50c35132@default(draft) add 3
+o  5:fa455b5098e0@default(draft) add 3
 |
 o  4:ce341209337f@default(draft) add 4
 |
 | x  3:0e84df4912da@default(draft) add 3
 | |
 | o  1:73d38bb17fd7@default(draft) add 1
 |/
 o  0:8685c6d34325@default(draft) add 0
 $ hg debugobsolete
-0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'amend', 'user': 'test'}
+0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'grab', 'user': 'test'}
-db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'amend', 'user': 'test'}
+db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
-Test graft --continue
+Test grab --continue
 $ hg up -qC 0
 $ echo 2 > 1
 $ hg ci -Am conflict 1
 created new head
 $ hg up -qC 6
-$ hg graft -O 7
+$ hg grab -r 7
-grafting 7:a5bfd90a2f29 "conflict" (tip)
+grabbing 7:a5bfd90a2f29 "conflict"
 merging 1
 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
-abort: unresolved conflicts, can't continue
+unresolved merge conflicts (see hg help resolve)
-(use 'hg resolve' and 'hg graft --continue')
+[1]
-[255]
 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
 7:a5bfd90a2f29
 $ echo 3 > 1
 $ hg resolve -m 1
 (no more unresolved files)
-continue: hg graft --continue
+continue: hg grab --continue
-$ hg graft --continue -O
+$ hg grab --continue
-grafting 7:a5bfd90a2f29 "conflict" (tip)
 $ glog --hidden
-@  8:920e58bb443b@default(draft) conflict
+@  8:fb2c0f0a0c54@default(draft) conflict
 |
 | x  7:a5bfd90a2f29@default(draft) conflict
 | |
-o |  6:acb28cd497b7@default(draft) add 1
+o |  6:417185465d2c@default(draft) add 1
 | |
-o |  5:0b9e50c35132@default(draft) add 3
+o |  5:fa455b5098e0@default(draft) add 3
 | |
 o |  4:ce341209337f@default(draft) add 4
 |/
 | x  3:0e84df4912da@default(draft) add 3
 | |
 | o  1:73d38bb17fd7@default(draft) add 1
 |/
 o  0:8685c6d34325@default(draft) add 0
 $ hg debugobsolete
-0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 0b9e50c35132ff548ec0065caea6a87e1ebcef32 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'amend', 'user': 'test'}
+0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'grab', 'user': 'test'}
-db038628b9e56f51a454c0da0c508df247b41748 acb28cd497b7f8767e01ef70f68697a959573c2d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'amend', 'user': 'test'}
+db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
-a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 920e58bb443b73eea9d6d65570b4241051ea3229 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'amend', 'user': 'test'}
+a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 fb2c0f0a0c54be4367988521bad2cbd33a540969 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'grab', 'user': 'test'}
 Test touch
 $ glog
-@  8:920e58bb443b@default(draft) conflict
+@  8:fb2c0f0a0c54@default(draft) conflict
 |
-o  6:acb28cd497b7@default(draft) add 1
+o  6:417185465d2c@default(draft) add 1
 |
-o  5:0b9e50c35132@default(draft) add 3
+o  5:fa455b5098e0@default(draft) add 3
 |
 o  4:ce341209337f@default(draft) add 4
 |
 | o  1:73d38bb17fd7@default(draft) add 1
 |/
 $ hg touch
 $ glog
 @  9:*@default(draft) conflict (glob)
 |
-o  6:acb28cd497b7@default(draft) add 1
+o  6:417185465d2c@default(draft) add 1
 |
-o  5:0b9e50c35132@default(draft) add 3
+o  5:fa455b5098e0@default(draft) add 3
 |
 o  4:ce341209337f@default(draft) add 4
 |
 | o  1:73d38bb17fd7@default(draft) add 1
 |/
 $ hg touch .
 $ glog
 @  10:*@default(draft) conflict (glob)
 |
-o  6:acb28cd497b7@default(draft) add 1
+o  6:417185465d2c@default(draft) add 1
 |
-o  5:0b9e50c35132@default(draft) add 3
+o  5:fa455b5098e0@default(draft) add 3
 |
 o  4:ce341209337f@default(draft) add 4
 |
 | o  1:73d38bb17fd7@default(draft) add 1
 |/
 Test olog
 $ hg olog | head -n 10 # hg touch makes the output unstable (fix it with devel option for more stable touch)
 @    d26d339c513f (12) add 4
 |\
-x |    af636757ce3b (11) add 3
+x |  ce341209337f (4) add 4
-|\ \     rewritten(description, user, parent, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+/     rewritten(description, user, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
-| | |
+|
-| \ \
+x    cf0c3904643c (11) add 3
-| |\ \
+|\     rewritten(description, user, parent, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
-| | | x  ce341209337f (4) add 4
+| |
-| | |      rewritten(description, user, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+| \
-| | |
+| |\
 Test obsstore stat
 $ hg debugobsstorestat
 markers total:                     10
 marker size:
 format v1:
 smallest length:           90
 longer length:             92
 median length:             91
-mean length:               91
+mean length:               90
 format v0:
 smallest length:           * (glob)
 longer length:             * (glob)
 median length:             * (glob)
 mean length:               * (glob)
 move:[36] will cause conflict at evolve
 atop:[38] will be evolved safely
 merging newfile
 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
 evolve failed!
-fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
+fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
 abort: unresolved merge conflicts (see hg help resolve)
 [255]
 $ glog -r "be23044af550::" --hidden
 @  38:61abd81de026@default(draft) will be evolved safely

branch	stable
changeset 3704	a0c39e8d2c29
parent 3702	f6979d64b9fb
child 3714	19ec729f3ca2
child 3747	1e103c7f7663