Show More
@@ -545,7 +545,7 b' attempted later.' | |||||
545 | | |
|
545 | | | |
546 | o 0:cb9a9f314b8b (public) a |
|
546 | o 0:cb9a9f314b8b (public) a | |
547 |
|
547 | |||
548 |
$ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental. |
|
548 | $ hg histedit -r 'b449568bf7fc' --commands - << EOF --config experimental.evolution.track-operation=1 | |
549 | > pick b449568bf7fc 13 f |
|
549 | > pick b449568bf7fc 13 f | |
550 | > pick 7395e1ff83bd 15 h |
|
550 | > pick 7395e1ff83bd 15 h | |
551 | > pick 6b70183d2492 14 g |
|
551 | > pick 6b70183d2492 14 g | |
@@ -556,7 +556,7 b' attempted later.' | |||||
556 | Editing (ee118ab9fa44), you may commit or record as needed now. |
|
556 | Editing (ee118ab9fa44), you may commit or record as needed now. | |
557 | (hg histedit --continue to resume) |
|
557 | (hg histedit --continue to resume) | |
558 | [1] |
|
558 | [1] | |
559 |
$ hg histedit --continue --config experimental. |
|
559 | $ hg histedit --continue --config experimental.evolution.track-operation=1 | |
560 | $ hg log -G |
|
560 | $ hg log -G | |
561 | @ 23:175d6b286a22 (secret) k |
|
561 | @ 23:175d6b286a22 (secret) k | |
562 | | |
|
562 | | |
@@ -1442,7 +1442,7 b' only a subset of those are displayed (be' | |||||
1442 | $ echo d > d |
|
1442 | $ echo d > d | |
1443 | $ hg ci -Am d |
|
1443 | $ hg ci -Am d | |
1444 | adding d |
|
1444 | adding d | |
1445 |
$ hg ci --amend -m dd --config experimental. |
|
1445 | $ hg ci --amend -m dd --config experimental.evolution.track-operation=1 | |
1446 | $ hg debugobsolete --index --rev "3+7" |
|
1446 | $ hg debugobsolete --index --rev "3+7" | |
1447 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} |
|
1447 | 1 6fdef60fcbabbd3d50e9b9cbc2a240724b91a5e1 d27fb9b066076fd921277a4b9e8b9cb48c95bc6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |
1448 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) |
|
1448 | 3 4715cf767440ed891755448016c2b8cf70760c30 7ae79c5d60f049c7b0dd02f5f25b9d60aaf7b36d 0 \(.*\) {'operation': 'amend', 'user': 'test'} (re) |
@@ -1225,7 +1225,7 b' equivalents in destination' | |||||
1225 | $ hg up 2 && hg log -r . # working dir is at rev 2 again |
|
1225 | $ hg up 2 && hg log -r . # working dir is at rev 2 again | |
1226 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1226 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
1227 | 2:1e9a3c00cbe9 b (no-eol) |
|
1227 | 2:1e9a3c00cbe9 b (no-eol) | |
1228 |
$ hg rebase -r 2 -d 3 --config experimental. |
|
1228 | $ hg rebase -r 2 -d 3 --config experimental.evolution.track-operation=1 | |
1229 | note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip) |
|
1229 | note: not rebasing 2:1e9a3c00cbe9 "b" (mybook), already in destination as 3:be1832deae9a "b" (tip) | |
1230 | Check that working directory and bookmark was updated to rev 3 although rev 2 |
|
1230 | Check that working directory and bookmark was updated to rev 3 although rev 2 | |
1231 | was skipped |
|
1231 | was skipped |
@@ -1281,7 +1281,7 b' we have reusable code here' | |||||
1281 | $ cat >> .hg/hgrc <<EOF |
|
1281 | $ cat >> .hg/hgrc <<EOF | |
1282 | > [experimental] |
|
1282 | > [experimental] | |
1283 | > evolution=true |
|
1283 | > evolution=true | |
1284 |
> |
|
1284 | > evolution.track-operation=1 | |
1285 | > EOF |
|
1285 | > EOF | |
1286 |
|
1286 | |||
1287 | $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py |
|
1287 | $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py |
General Comments 0
You need to be logged in to leave comments.
Login now