--- a/tests/test-amend-patch.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-amend-patch.t Thu Oct 25 16:33:10 2018 +0200
@@ -88,7 +88,7 @@
@ af624b221c0c (1) added a
|
x f7ad41964313 (0) added a
- rewritten(content) as af624b221c0c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(content) as af624b221c0c by test (Thu Jan 01 00:00:00 1970 +0000)
diff --git a/a b/a
--- a/a
+++ b/a
--- a/tests/test-amend.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-amend.t Thu Oct 25 16:33:10 2018 +0200
@@ -19,21 +19,23 @@
marked working directory as branch foo
(branches are permanent and global, did you want a bookmark?)
$ hg amend -d '0 0' -n "this a note on the obsmarker and supported for hg>=4.4"
+ current hg version does not support storing note in obsmarker
$ hg debugobsolete
07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {07f4944404050f47db2e5c5071e0e84e7a27bba9} (*) {'ef1': '*', 'user': 'test'} (glob)
+
$ hg obslog
- @ 6a022cbb61d5 (1) adda
+ @ 6a022cbb61d5 (2) adda
|
x 07f494440405 (0) adda
- rewritten(branch) as 6a022cbb61d5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
- note: this a note on the obsmarker and supported for hg>=4.4
+ rewritten(branch) as 6a022cbb61d5 by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg branch
foo
$ hg branches
- foo 1:6a022cbb61d5
+ foo 2:6a022cbb61d5
$ glog
- @ 1@foo(draft) adda
+ @ 2@foo(draft) adda
Test no-op
@@ -41,7 +43,7 @@
nothing changed
[1]
$ glog
- @ 1@foo(draft) adda
+ @ 2@foo(draft) adda
Test forcing the message to the same value, no intermediate revision.
@@ -50,7 +52,7 @@
nothing changed
[1]
$ glog
- @ 1@foo(draft) adda
+ @ 2@foo(draft) adda
Test collapsing into an existing revision, no intermediate revision.
@@ -72,19 +74,20 @@
$ hg ci -m reseta
$ hg debugobsolete
07f4944404050f47db2e5c5071e0e84e7a27bba9 6a022cbb61d5ba0f03f98ff2d36319dfea1034ae 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ b2e32ffb533cbe1d5759638c0cd4e8abc43b2738 0 {07f4944404050f47db2e5c5071e0e84e7a27bba9} (*) {'ef1': '*', 'user': 'test'} (glob)
$ hg phase 2
2: draft
$ glog
- @ 3@foo(draft) reseta
+ @ 4@foo(draft) reseta
|
- o 2@foo(draft) changea
+ o 3@foo(draft) changea
|
- o 1@foo(draft) adda
+ o 2@foo(draft) adda
Specify precise commit date with -d
$ hg amend -d '2001-02-03 04:05:06 +0700'
$ hg parents --template '{rev} {date|date}\n'
- 4 Sat Feb 03 04:05:06 2001 +0700
+ 5 Sat Feb 03 04:05:06 2001 +0700
Specify "now" as commit date with -D
$ before=`date +%s`
@@ -93,13 +96,13 @@
$ after=`date +%s`
$ (echo $before ; echo $commit; echo $after) | sort -k1 -n -s
\d+ (re)
- \d+ 0 rev5 (re)
+ \d+ 0 rev6 (re)
\d+ (re)
Specify current user as committer with -U
$ HGUSER=newbie hg amend -U
$ hg parents --template '{rev} {author}\n'
- 6 newbie
+ 7 newbie
Check that --logfile works
$ echo "logfile message" > logfile.txt
@@ -114,7 +117,7 @@
(use 'hg config --edit' to set your username)
[255]
$ hg sum
- parent: 7:* tip (glob)
+ parent: 8:* tip (glob)
logfile message
branch: foo
commit: 1 unknown (clean)
--- a/tests/test-corrupt.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-corrupt.t Thu Oct 25 16:33:10 2018 +0200
@@ -101,6 +101,7 @@
$ hg prune --fold -n -1 -- -2 -3
+ current hg version does not support storing note in obsmarker
2 changesets pruned
$ hg push ../other
pushing to ../other
--- a/tests/test-discovery-obshashrange-cache.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-discovery-obshashrange-cache.t Thu Oct 25 16:33:10 2018 +0200
@@ -107,7 +107,6 @@
adding file changes
added 8 changesets with 0 changes to 0 files
8 new obsolescence markers
- new changesets 1ea73414a91b:4de32a90b66c
(run 'hg update' to get a working copy)
client cache is empty because the discovery was empty
--- a/tests/test-discovery-obshashrange.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-discovery-obshashrange.t Thu Oct 25 16:33:10 2018 +0200
@@ -31,8 +31,7 @@
$ cd server
$ hg debugbuilddag '.+7'
$ hg blackbox
- * @0000000000000000000000000000000000000000 (*)> init server exited 0 after *.?? seconds (glob)
- * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob)
+ * @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)
* @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
* @0000000000000000000000000000000000000000 (*)> debugbuilddag .+7 (glob) (no-windows !)
* @0000000000000000000000000000000000000000 (*)> debugbuilddag ".+7" (glob) (windows !)
@@ -81,7 +80,7 @@
* @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
* @0000000000000000000000000000000000000000 (*)> debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd exited 0 after *.?? seconds (glob)
- * @0000000000000000000000000000000000000000 (*)> debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 --config *experimental.obshashrange.max-revs=1* (glob)
+ * @0000000000000000000000000000000000000000 (*)> debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 (glob)
* @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
* @0000000000000000000000000000000000000000 (*)> debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 --config *experimental.obshashrange.max-revs=1* exited 0 after *.?? seconds (glob)
@@ -89,7 +88,7 @@
* @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
* @0000000000000000000000000000000000000000 (*)> debugobsolete cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d exited 0 after *.?? seconds (glob)
- * @0000000000000000000000000000000000000000 (*)> debugobsolete dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 --config *experimental.obshashrange.warm-cache=0* (glob)
+ * @0000000000000000000000000000000000000000 (*)> debugobsolete dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 (glob)
* @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
* @0000000000000000000000000000000000000000 (*)> debugobsolete dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 --config *experimental.obshashrange.warm-cache=0* exited 0 after *.?? seconds (glob)
@@ -132,7 +131,6 @@
adding file changes
added 5 changesets with 0 changes to 0 files
3 new obsolescence markers
- new changesets 1ea73414a91b:bebd167eb94d
(run 'hg update' to get a working copy)
$ hg -R ../server blackbox
* @0000000000000000000000000000000000000000 (*)> debugobshashrange --subranges --rev tip (glob)
@@ -146,9 +144,9 @@
1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> strip detected, evo-ext-firstmerge cache reset (glob)
1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (8r) (glob)
* @0000000000000000000000000000000000000000 (*)> debugobshashrange --subranges --rev tip exited 0 after *.?? seconds (glob)
- * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob)
+ * @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)
* @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
- * @0000000000000000000000000000000000000000 (*)> -R ../server blackbox (glob)
+ * @0000000000000000000000000000000000000000 (*)> blackbox (glob)
$ rm ../server/.hg/blackbox.log
$ hg -R ../server/ debugobsolete --rev ::4 | sort
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -156,7 +154,6 @@
cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
$ rm ../server/.hg/blackbox.log
$ hg blackbox
- * @0000000000000000000000000000000000000000 (*)> clone *ssh://user@dummy/server* client exited 0 after *.?? seconds (glob)
* @0000000000000000000000000000000000000000 (*)> pull --rev 4 (glob)
* @0000000000000000000000000000000000000000 (*)> updated base branch cache in *.???? seconds (glob)
* @0000000000000000000000000000000000000000 (*)> wrote base branch cache with 1 labels and 1 nodes (glob)
@@ -223,7 +220,7 @@
bundle2-output-bundle: "HG20", 4 parts total
bundle2-output-part: "replycaps" * bytes payload (glob)
bundle2-output-part: "changegroup" (params: 1 mandatory) streamed payload
- bundle2-output-part: "phase-heads" 24 bytes payload
+ bundle2-output-part: "pushkey" (params: 4 mandatory) empty payload
bundle2-output-part: "obsmarkers" streamed payload
remote: adding changesets
remote: adding manifests
@@ -232,13 +229,14 @@
remote: 1 new obsolescence markers
bundle2-input-bundle: no-transaction
bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
+ bundle2-input-part: "reply:pushkey" (params: 0 advisory) supported
bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported
- bundle2-input-bundle: 1 parts total
+ bundle2-input-bundle: 2 parts total
preparing listkeys for "phases"
sending listkeys command
received listkey for "phases": 58 bytes
$ hg -R ../server blackbox
- * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob)
+ * @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)
1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (1r) (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-depthcache in *.???? seconds (1r) (glob)
1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-stablesort in *.???? seconds (1r) (glob)
@@ -250,7 +248,7 @@
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (1r, 1o) (glob)
* @0000000000000000000000000000000000000000 (*)> 1 incoming changes - new heads: 45f8b879de92 (glob)
* @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
- * @0000000000000000000000000000000000000000 (*)> -R ../server blackbox (glob)
+ * @0000000000000000000000000000000000000000 (*)> blackbox (glob)
$ rm ../server/.hg/blackbox.log
testing push with extra local markers
@@ -281,12 +279,12 @@
remote: 2 new obsolescence markers
[1]
$ hg -R ../server blackbox
- * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob)
+ * @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)
* @0000000000000000000000000000000000000000 (*)> obshashcache clean - new markers affect 2 changeset and cached ranges (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 2o) (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 2o) (glob)
* @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
- * @0000000000000000000000000000000000000000 (*)> -R ../server blackbox (glob)
+ * @0000000000000000000000000000000000000000 (*)> blackbox (glob)
$ rm ../server/.hg/blackbox.log
$ hg -R ../server/ debugobsolete --rev ::tip | sort
111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -380,29 +378,26 @@
adding file changes
added 2 changesets with 0 changes to 0 files (+1 heads)
3 new obsolescence markers
- new changesets c8d03c1b5e94:f69452c5b1af
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R ../server blackbox
- * @0000000000000000000000000000000000000000 (*)> -R ../server/ debugobsolete --rev '::tip' (glob) (no-windows !)
- * @0000000000000000000000000000000000000000 (*)> -R ../server/ debugobsolete --rev ::tip (glob) (windows !)
+ * @0000000000000000000000000000000000000000 (*)> debugobsolete --rev '::tip' (glob)
* @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
* @0000000000000000000000000000000000000000 (*)> writing .hg/cache/tags2-visible with 0 tags (glob)
- * @0000000000000000000000000000000000000000 (*)> -R ../server/ debugobsolete --rev '::tip' exited 0 after *.?? seconds (glob) (no-windows !)
- * @0000000000000000000000000000000000000000 (*)> -R ../server/ debugobsolete --rev ::tip exited 0 after *.?? seconds (glob) (windows !)
- * @0000000000000000000000000000000000000000 (*)> -R ../server debugobsolete aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd (glob)
+ * @0000000000000000000000000000000000000000 (*)> -R ../server/ debugobsolete --rev '::tip' exited 0 after *.?? seconds (glob)
+ * @0000000000000000000000000000000000000000 (*)> debugobsolete aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd (glob)
* @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
* @0000000000000000000000000000000000000000 (*)> -R ../server debugobsolete aaaaaaa11111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd exited 0 after *.?? seconds (glob)
- * @0000000000000000000000000000000000000000 (*)> -R ../server debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d (glob)
+ * @0000000000000000000000000000000000000000 (*)> debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d (glob)
* @0000000000000000000000000000000000000000 (*)> alias 'debugobsolete' expands to 'debugobsolete -d '0 0'' (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obscache in *.???? seconds (0r, 1o) (glob)
* @0000000000000000000000000000000000000000 (*)> -R ../server debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 bebd167eb94d257ace0e814aeb98e6972ed2970d exited 0 after *.?? seconds (glob)
- * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob)
- 1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> obshashcache clean - new markers affect 3 changeset and cached ranges (glob)
+ * @0000000000000000000000000000000000000000 (*)> serve --stdio (glob)
+ * @0000000000000000000000000000000000000000 (*)> obshashcache clean - new markers affect 3 changeset and cached ranges (glob)
* @0000000000000000000000000000000000000000 (*)> updated evo-ext-obshashrange in *.???? seconds (0r, 4o) (glob)
* @0000000000000000000000000000000000000000 (*)> -R server serve --stdio exited 0 after *.?? seconds (glob)
- * @0000000000000000000000000000000000000000 (*)> -R ../server blackbox (glob)
+ * @0000000000000000000000000000000000000000 (*)> blackbox (glob)
$ rm ../server/.hg/blackbox.log
$ hg -R ../server/ debugobsolete --rev '::6' | sort
111111111111111aaaaaaaaa1111111111111111 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -839,7 +834,6 @@
adding file changes
added 1 changesets with 0 changes to 0 files
1 new obsolescence markers
- new changesets 4de32a90b66c
(run 'hg update' to get a working copy)
$ hg rollback
repository tip rolled back to revision 7 (undo pull)
@@ -892,7 +886,6 @@
adding file changes
added 1 changesets with 0 changes to 0 files
1 new obsolescence markers
- new changesets 4de32a90b66c
(run 'hg update' to get a working copy)
$ hg blackbox
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' (glob) (no-windows !)
@@ -981,7 +974,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
5 new obsolescence markers
- new changesets 45f8b879de92
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -G
o 8 45f8b879de92 foo tip
@@ -1017,8 +1009,8 @@
1970/01/01 00:00:00 * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> debugobshashrange --subranges --rev 'heads(all())' exited 0 after *.?? seconds (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G (glob)
* @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> log -G exited 0 after *.?? seconds (glob)
- * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> --config 'extensions.strip=' strip -r 'desc("foo")' (glob) (no-windows !)
- 1970/01/01 00:00:00 * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> saved backup bundle to $TESTTMP/client/.hg/strip-backup/45f8b879de92-94c82517-backup.hg (glob)
+ * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> strip -r 'desc("foo")' (glob)
+ * @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> saved backup bundle to $TESTTMP/client/.hg/strip-backup/45f8b879de92-94c82517-backup.hg (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> strip detected, evo-ext-obscache cache reset (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (5r, 11o) (glob)
* @bebd167eb94d257ace0e814aeb98e6972ed2970d (*)> updated evo-ext-obscache in *.???? seconds (3r, 0o) (glob)
--- a/tests/test-divergent.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-divergent.t Thu Oct 25 16:33:10 2018 +0200
@@ -55,7 +55,7 @@
1 changesets pruned
$ hg prune -s 593c57f2117e "desc('added b')" --hidden
1 changesets pruned
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg log -G
@ 3:8374d2ddc3a4@default(draft) divergent [content-divergent]
@@ -70,7 +70,7 @@
with: [3] divergent
base: [1] added b
updating to "local" side of the conflict: 593c57f2117e
- merging "other" content-divergent changeset '8374d2ddc3a4'
+ merging "other" divergent changeset '8374d2ddc3a4'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at 45bf1312f454
$ hg log -G
@@ -115,7 +115,7 @@
1 changesets pruned
$ hg prune -s e3ff64ce8d4c 48819a835615 --hidden
1 changesets pruned
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg log -G
@ 7:b2ae71172042@default(draft) add _c [content-divergent]
@@ -131,7 +131,7 @@
with: [7] add _c
base: [5] add _c
updating to "local" side of the conflict: e3ff64ce8d4c
- merging "other" content-divergent changeset 'b2ae71172042'
+ merging "other" divergent changeset 'b2ae71172042'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
nothing changed
working directory is now at e3ff64ce8d4c
@@ -172,7 +172,7 @@
1 changesets pruned
$ hg prune -s 05a6b6a9e633 37445b16603b --hidden
1 changesets pruned
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg log -G
@ 3:6b096fb45070@default(draft) bdivergent [content-divergent]
|
@@ -200,7 +200,7 @@
merge:[3] bdivergent
with: [2] bdivergent
base: [1] add _b
- merging "other" content-divergent changeset '05a6b6a9e633'
+ merging "other" divergent changeset '05a6b6a9e633'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at 73ff357d3975
--- a/tests/test-drop.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-drop.t Thu Oct 25 16:33:10 2018 +0200
@@ -178,7 +178,7 @@
$ hg commit --amend
$ summary
============ graph ==============
- @ changeset: 3:a2c06c884bfe
+ @ changeset: 4:a2c06c884bfe
| tag: tip
| parent: 1:19509a42b0d0
| user: test
@@ -196,17 +196,23 @@
summary: add base
============ hidden =============
- @ changeset: 3:a2c06c884bfe
+ @ changeset: 4:a2c06c884bfe
| tag: tip
| parent: 1:19509a42b0d0
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: add child
|
+ | x changeset: 3:87ea30a976fd
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | obsolete: pruned
+ | | summary: temporary amend commit for 34b6c051bf1f
+ | |
| x changeset: 2:34b6c051bf1f
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: amended using amend as 3:a2c06c884bfe
+ | obsolete: amended as a2c06c884bfe
| summary: add child
|
o changeset: 1:19509a42b0d0
@@ -220,7 +226,8 @@
summary: add base
============ obsmark ============
- 34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+ 34b6c051bf1f78db6aef400776de5cb964470207 a2c06c884bfe53d3840026248bd8a7eafa152df8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
+ 87ea30a976fdf235bf096f04899cb02a903873e2 0 {34b6c051bf1f78db6aef400776de5cb964470207} (*) {'ef1': '*', 'user': 'test'} (glob)
$ hg drop .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory now at 19509a42b0d0
--- a/tests/test-evolve-abort-contentdiv.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-abort-contentdiv.t Thu Oct 25 16:33:10 2018 +0200
@@ -51,12 +51,16 @@
$ echo foobar > d
$ hg amend
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg glog --hidden
- @ 6:9c1631e352d9 added d
+ @ 8:9c1631e352d9 added d
| () draft
- | o 5:e49523854bc8 added d
- |/ () draft
+ | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
+ | | () draft
+ +---o 6:e49523854bc8 added d
+ | | () draft
+ | | x 5:14721514d41c temporary amend commit for c41c793e0ef1
+ | |/ () draft
| x 4:c41c793e0ef1 added d
|/ () draft
o 3:ca1b80f7960a added c
@@ -69,10 +73,10 @@
() draft
$ hg evolve --content-divergent
- merge:[6] added d
- with: [5] added d
+ merge:[8] added d
+ with: [6] added d
base: [4] added d
- merging "other" content-divergent changeset 'e49523854bc8'
+ merging "other" divergent changeset 'e49523854bc8'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -81,45 +85,20 @@
$ hg status -v
M d
- # The repository is in an unfinished *evolve* state.
-
- # Unresolved merge conflicts:
- #
- # d
- #
- # To mark files as resolved: hg resolve --mark FILE
-
- # To continue: hg evolve --continue
- # To abort: hg evolve --abort
- # To stop: hg evolve --stop
- # (also see `hg help evolve.interrupted`)
-
- $ hg parents
- changeset: 6:9c1631e352d9
- tag: tip
- parent: 3:ca1b80f7960a
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- instability: content-divergent
- summary: added d
-
- changeset: 5:e49523854bc8
- parent: 3:ca1b80f7960a
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- instability: content-divergent
- summary: added d
-
$ hg evolve --abort
evolve aborted
working directory is now at 9c1631e352d9
$ hg glog --hidden
- @ 6:9c1631e352d9 added d
+ @ 8:9c1631e352d9 added d
| () draft
- | o 5:e49523854bc8 added d
- |/ () draft
+ | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
+ | | () draft
+ +---o 6:e49523854bc8 added d
+ | | () draft
+ | | x 5:14721514d41c temporary amend commit for c41c793e0ef1
+ | |/ () draft
| x 4:c41c793e0ef1 added d
|/ () draft
o 3:ca1b80f7960a added c
@@ -141,30 +120,42 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo bar > c
$ hg amend
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg up ca1b80f7960a --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (ca1b80f7960a)
(use 'hg evolve' to update to its successor: 2ba73e31f264)
$ echo foobar > c
$ hg amend
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ echo bar > c
$ hg amend
$ hg glog --hidden
- @ 10:491e10505bae added c
+ @ 16:491e10505bae added c
| () draft
- | x 9:7398f702a162 added c
- |/ () draft
- | o 8:2ba73e31f264 added c
+ | x 15:b2451992ec73 temporary amend commit for 7398f702a162
+ | | () draft
+ | x 14:7398f702a162 added c
|/ () draft
- | o 7:f0f1694f123e added d
+ | x 13:1c0d5c8e745f temporary amend commit for ca1b80f7960a
| | () draft
- | | x 6:9c1631e352d9 added d
+ +---o 12:2ba73e31f264 added c
+ | | () draft
+ | | x 11:277fdfc7d90c temporary amend commit for ca1b80f7960a
+ | |/ () draft
+ | | o 10:f0f1694f123e added d
| |/ () draft
- | | o 5:e49523854bc8 added d
+ | | x 9:36f1dead57ef temporary amend commit for 9c1631e352d9
+ | | | () draft
+ | | x 8:9c1631e352d9 added d
| |/ () draft
+ | | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
+ | | | () draft
+ | +---o 6:e49523854bc8 added d
+ | | | () draft
+ | | | x 5:14721514d41c temporary amend commit for c41c793e0ef1
+ | | |/ () draft
| | x 4:c41c793e0ef1 added d
| |/ () draft
| x 3:ca1b80f7960a added c
@@ -177,17 +168,17 @@
() draft
$ hg evolve --all --content-divergent
- merge:[8] added c
- with: [10] added c
+ merge:[12] added c
+ with: [16] added c
base: [3] added c
updating to "local" side of the conflict: 2ba73e31f264
- merging "other" content-divergent changeset '491e10505bae'
+ merging "other" divergent changeset '491e10505bae'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- merge:[5] added d
- with: [7] added d
+ merge:[6] added d
+ with: [10] added d
base: [4] added d
updating to "local" side of the conflict: e49523854bc8
- merging "other" content-divergent changeset 'f0f1694f123e'
+ merging "other" divergent changeset 'f0f1694f123e'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -199,18 +190,30 @@
working directory is now at 491e10505bae
$ hg glog --hidden
- @ 10:491e10505bae added c
+ @ 16:491e10505bae added c
| () draft
- | x 9:7398f702a162 added c
- |/ () draft
- | o 8:2ba73e31f264 added c
+ | x 15:b2451992ec73 temporary amend commit for 7398f702a162
+ | | () draft
+ | x 14:7398f702a162 added c
|/ () draft
- | o 7:f0f1694f123e added d
+ | x 13:1c0d5c8e745f temporary amend commit for ca1b80f7960a
| | () draft
- | | x 6:9c1631e352d9 added d
+ +---o 12:2ba73e31f264 added c
+ | | () draft
+ | | x 11:277fdfc7d90c temporary amend commit for ca1b80f7960a
+ | |/ () draft
+ | | o 10:f0f1694f123e added d
| |/ () draft
- | | o 5:e49523854bc8 added d
+ | | x 9:36f1dead57ef temporary amend commit for 9c1631e352d9
+ | | | () draft
+ | | x 8:9c1631e352d9 added d
| |/ () draft
+ | | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
+ | | | () draft
+ | +---o 6:e49523854bc8 added d
+ | | | () draft
+ | | | x 5:14721514d41c temporary amend commit for c41c793e0ef1
+ | | |/ () draft
| | x 4:c41c793e0ef1 added d
| |/ () draft
| x 3:ca1b80f7960a added c
@@ -223,16 +226,16 @@
() draft
$ hg obslog -r . --all
- o 2ba73e31f264 (8) added c
+ o 2ba73e31f264 (12) added c
|
- | @ 491e10505bae (10) added c
+ | @ 491e10505bae (16) added c
| |
- | x 7398f702a162 (9) added c
- |/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | x 7398f702a162 (14) added c
+ |/ rewritten(content) as 491e10505bae by test (Thu Jan 01 00:00:00 1970 +0000)
|
x ca1b80f7960a (3) added c
- rewritten(content) as 2ba73e31f264 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
- rewritten(content) as 7398f702a162 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(content) as 2ba73e31f264 by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(content) as 7398f702a162 by test (Thu Jan 01 00:00:00 1970 +0000)
$ cd ..
@@ -271,12 +274,12 @@
(use 'hg evolve' to update to its successor: 69bdd23a9b0d)
$ echo bar > d
$ hg amend
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg glog
- @ 7:e49523854bc8 added d
+ @ 9:e49523854bc8 added d
| () draft
- | o 6:69bdd23a9b0d added d
+ | o 7:69bdd23a9b0d added d
| | () draft
o | 3:ca1b80f7960a added c
| | () draft
@@ -288,8 +291,8 @@
() draft
$ hg evolve --content-divergent
- merge:[7] added d
- with: [6] added d
+ merge:[9] added d
+ with: [7] added d
base: [4] added d
rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a
merging c
@@ -302,9 +305,9 @@
working directory is now at e49523854bc8
$ hg glog
- @ 7:e49523854bc8 added d
+ @ 9:e49523854bc8 added d
| () draft
- | o 6:69bdd23a9b0d added d
+ | o 7:69bdd23a9b0d added d
| | () draft
o | 3:ca1b80f7960a added c
| | () draft
@@ -326,9 +329,9 @@
$ hg amend
$ hg glog
- @ 8:33e4442acf98 added d
+ @ 11:33e4442acf98 added d
| () draft
- | o 7:e49523854bc8 added d
+ | o 9:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -340,12 +343,12 @@
() draft
$ hg evolve --content-divergent
- merge:[7] added d
- with: [8] added d
+ merge:[9] added d
+ with: [11] added d
base: [4] added d
rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a
updating to "local" side of the conflict: e49523854bc8
- merging "other" content-divergent changeset 'a663d1567f0b'
+ merging "other" divergent changeset 'a663d1567f0b'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -357,9 +360,9 @@
working directory is now at 33e4442acf98
$ hg glog
- @ 8:33e4442acf98 added d
+ @ 11:33e4442acf98 added d
| () draft
- | o 7:e49523854bc8 added d
+ | o 9:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
--- a/tests/test-evolve-abort-orphan.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-abort-orphan.t Thu Oct 25 16:33:10 2018 +0200
@@ -78,18 +78,18 @@
$ echo babar > d
$ hg add d
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg evolve --all
move:[4] added d
- atop:[5] added c
+ atop:[6] added c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
[1]
$ hg parents
- changeset: 5:e93a9161a274
+ changeset: 6:e93a9161a274
tag: tip
parent: 2:b1661037fa25
user: test
@@ -99,7 +99,7 @@
changeset: 4:c41c793e0ef1
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- instability: orphan
+ trouble: unstable
summary: added d
@@ -108,7 +108,7 @@
working directory is now at e93a9161a274
$ hg glog
- @ 5:e93a9161a274 added c
+ @ 6:e93a9161a274 added c
| () draft
| o 4:c41c793e0ef1 added d
| | () draft
@@ -129,7 +129,7 @@
$ hg evolve --all
move:[4] added d
- atop:[5] added c
+ atop:[6] added c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -151,12 +151,12 @@
$ echo bar > c
$ hg add c
$ hg amend
- 3 new orphan changesets
+ 3 new unstable changesets
$ hg evolve --all
move:[2] added b
- atop:[7] added a
- move:[5] added c
+ atop:[9] added a
+ move:[6] added c
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -166,28 +166,15 @@
$ hg status -v
M c
A d
- # The repository is in an unfinished *evolve* state.
-
- # Unresolved merge conflicts:
- #
- # c
- #
- # To mark files as resolved: hg resolve --mark FILE
-
- # To continue: hg evolve --continue
- # To abort: hg evolve --abort
- # To stop: hg evolve --stop
- # (also see `hg help evolve.interrupted`)
-
$ hg glog
- @ 8:0c41ec482070 added b
+ @ 10:0c41ec482070 added b
| () draft
- o 7:125af0ed8cae added a
+ o 9:125af0ed8cae added a
| () draft
- | o 6:e83de241f751 added d
+ | o 7:e83de241f751 added d
| | () draft
- | @ 5:e93a9161a274 added c
+ | @ 6:e93a9161a274 added c
| | () draft
| x 2:b1661037fa25 added b
| | () draft
@@ -201,11 +188,11 @@
working directory is now at 125af0ed8cae
$ hg glog
- @ 7:125af0ed8cae added a
+ @ 9:125af0ed8cae added a
| () draft
- | o 6:e83de241f751 added d
+ | o 7:e83de241f751 added d
| | () draft
- | o 5:e93a9161a274 added c
+ | o 6:e93a9161a274 added c
| | () draft
| o 2:b1661037fa25 added b
| | () draft
@@ -258,26 +245,26 @@
[1] added a
$ echo aa > a
$ hg amend
- 5 new orphan changesets
+ 5 new unstable changesets
$ hg evolve --all
move:[2] added b
- atop:[7] added a
+ atop:[8] added a
move:[4] added c
- atop:[7] added a
+ atop:[8] added a
move:[6] foo to a
- atop:[7] added a
+ atop:[8] added a
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
[1]
$ hg glog
- o 9:7f8e8bd9f0b6 added c
+ o 10:7f8e8bd9f0b6 added c
| () draft
- | o 8:db3b42ef4da7 added b
+ | o 9:db3b42ef4da7 added b
|/ () draft
- @ 7:807e8e2ca559 added a
+ @ 8:807e8e2ca559 added a
| () draft
| @ 6:8f20d4390c21 foo to a
| | () draft
@@ -299,7 +286,7 @@
working directory is now at 807e8e2ca559
$ hg glog
- @ 7:807e8e2ca559 added a
+ @ 8:807e8e2ca559 added a
| () draft
| o 6:8f20d4390c21 foo to a
| | () draft
@@ -325,21 +312,21 @@
$ hg evolve --all
move:[2] added b
- atop:[7] added a
+ atop:[8] added a
move:[4] added c
- atop:[7] added a
+ atop:[8] added a
move:[6] foo to a
- atop:[7] added a
+ atop:[8] added a
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
[1]
$ hg glog
- o 9:7f8e8bd9f0b6 added c
+ o 10:7f8e8bd9f0b6 added c
| () draft
- | o 8:db3b42ef4da7 added b
+ | o 9:db3b42ef4da7 added b
|/ () draft
- @ 7:807e8e2ca559 added a
+ @ 8:807e8e2ca559 added a
| () draft
| @ 6:8f20d4390c21 foo to a
| | () draft
@@ -371,7 +358,7 @@
adding manifests
adding file changes
added 10 changesets with 8 changes to 5 files (+4 heads)
- 3 new obsolescence markers
+ 4 new obsolescence markers
$ cd ../clonerepo
$ hg up 7f8e8bd9f0b6
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -401,28 +388,28 @@
$ hg evolve --all
move:[3] added c
- atop:[8] added b
+ atop:[9] added b
move:[5] added d
- atop:[9] added c
+ atop:[10] added c
move:[6] foo to a
- atop:[7] added a
+ atop:[8] added a
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
[1]
$ hg glog
- o 12:1c476940790a added d
+ o 13:1c476940790a added d
| () draft
- | o 11:c10a55eb0cc6 added c
+ | o 12:c10a55eb0cc6 added c
| | () draft
- +---o 10:48eca1ed5478 made an new commit on evolved rev
+ +---o 11:48eca1ed5478 made an new commit on evolved rev
| | () draft
- o | 9:7f8e8bd9f0b6 added c
+ o | 10:7f8e8bd9f0b6 added c
| | () draft
- | o 8:db3b42ef4da7 added b
+ | o 9:db3b42ef4da7 added b
|/ () draft
- @ 7:807e8e2ca559 added a
+ @ 8:807e8e2ca559 added a
| () draft
| @ 6:8f20d4390c21 foo to a
| | () draft
@@ -463,10 +450,10 @@
$ echo foo > c
$ hg add c
$ hg amend
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg glog
- @ 4:a0086c17bfc7 added a
+ @ 5:a0086c17bfc7 added a
| () draft
| o 3:17509928e5bf added c
| | () draft
@@ -479,7 +466,7 @@
$ hg evolve --all
move:[2] added b
- atop:[4] added a
+ atop:[5] added a
move:[3] added c
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
@@ -487,9 +474,9 @@
[1]
$ hg glog
- @ 5:c1f4718020e3 added b
+ @ 6:c1f4718020e3 added b
| (bm1) draft
- o 4:a0086c17bfc7 added a
+ o 5:a0086c17bfc7 added a
| () draft
| @ 3:17509928e5bf added c
| | () draft
@@ -505,7 +492,7 @@
working directory is now at a0086c17bfc7
$ hg glog
- @ 4:a0086c17bfc7 added a
+ @ 5:a0086c17bfc7 added a
| () draft
| o 3:17509928e5bf added c
| | () draft
@@ -521,11 +508,11 @@
$ hg next --evolve
move:[2] added b
- atop:[4] added a
+ atop:[5] added a
working directory now at c1f4718020e3
$ hg next --evolve
move:[3] added c
- atop:[5] added b
+ atop:[6] added b
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
--- a/tests/test-evolve-abort-phasediv.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-abort-phasediv.t Thu Oct 25 16:33:10 2018 +0200
@@ -50,8 +50,10 @@
$ hg amend
$ hg glog --hidden
- @ 6:ddba58020bc0 added d
+ @ 7:ddba58020bc0 added d
| () draft
+ | x 6:7490b254b0eb temporary amend commit for cfe30edc6125
+ | | () draft
| x 5:cfe30edc6125 added d
|/ () draft
| x 4:c41c793e0ef1 added d
@@ -66,10 +68,10 @@
() draft
$ hg phase -r c41c793e0ef1 --public --hidden
- 1 new phase-divergent changesets
+ 1 new bumped changesets
$ hg glog
- @ 6:ddba58020bc0 added d
+ @ 7:ddba58020bc0 added d
| () draft
| o 4:c41c793e0ef1 added d
| | () public
@@ -82,7 +84,7 @@
o 0:8fa14d15e168 added hgignore
() public
$ hg evolve --phase-divergent
- recreate:[6] added d
+ recreate:[7] added d
atop:[4] added d
rebasing to destination parent: ca1b80f7960a
merging c
@@ -94,19 +96,6 @@
$ hg status -v
M c
A d
- # The repository is in an unfinished *evolve* state.
-
- # Unresolved merge conflicts:
- #
- # c
- #
- # To mark files as resolved: hg resolve --mark FILE
-
- # To continue: hg evolve --continue
- # To abort: hg evolve --abort
- # To stop: hg evolve --stop
- # (also see `hg help evolve.interrupted`)
-
$ hg parents
changeset: 3:ca1b80f7960a
@@ -114,12 +103,12 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: added c
- changeset: 6:ddba58020bc0
+ changeset: 7:ddba58020bc0
tag: tip
parent: 1:c7586e2a9264
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- instability: phase-divergent
+ trouble: bumped
summary: added d
@@ -128,7 +117,7 @@
working directory is now at ddba58020bc0
$ hg glog
- @ 6:ddba58020bc0 added d
+ @ 7:ddba58020bc0 added d
| () draft
| o 4:c41c793e0ef1 added d
| | () public
@@ -157,39 +146,45 @@
$ hg add b
$ hg amend
$ hg phase -r c41c793e0ef1 --public --hidden
- 2 new phase-divergent changesets
+ 2 new bumped changesets
$ hg evolve --list
e44ebefe4f54: added d
- phase-divergent: c41c793e0ef1 (immutable precursor)
+ bumped: c41c793e0ef1 (immutable precursor)
28cd06b3f801: added c
- phase-divergent: ca1b80f7960a (immutable precursor)
+ bumped: ca1b80f7960a (immutable precursor)
$ hg evolve --dry-run --all --phase-divergent
- recreate:[7] added d
+ recreate:[9] added d
atop:[4] added d
hg rebase --rev e44ebefe4f54 --dest ca1b80f7960a;
hg update c41c793e0ef1;
hg revert --all --rev e44ebefe4f54;
- hg commit --msg "phase-divergent update to e44ebefe4f54"
- recreate:[9] added c
+ hg commit --msg "bumped update to e44ebefe4f54"
+ recreate:[12] added c
atop:[3] added c
hg rebase --rev 28cd06b3f801 --dest b1661037fa25;
hg update ca1b80f7960a;
hg revert --all --rev 28cd06b3f801;
- hg commit --msg "phase-divergent update to 28cd06b3f801"
+ hg commit --msg "bumped update to 28cd06b3f801"
$ hg glog --hidden
- @ 9:28cd06b3f801 added c
+ @ 12:28cd06b3f801 added c
| () draft
- | x 8:9ff8adbe8a24 added c
+ | x 11:df2e1e03f9b3 temporary amend commit for 9ff8adbe8a24
+ | | () draft
+ | x 10:9ff8adbe8a24 added c
|/ () draft
- | o 7:e44ebefe4f54 added d
+ | o 9:e44ebefe4f54 added d
|/ () draft
- | x 6:ddba58020bc0 added d
+ | x 8:e8e0a6683006 temporary amend commit for ddba58020bc0
+ | | () draft
+ | x 7:ddba58020bc0 added d
|/ () draft
+ | x 6:7490b254b0eb temporary amend commit for cfe30edc6125
+ | | () draft
| x 5:cfe30edc6125 added d
|/ () draft
| o 4:c41c793e0ef1 added d
@@ -204,12 +199,12 @@
() public
$ hg evolve --phase-divergent --all
- recreate:[7] added d
+ recreate:[9] added d
atop:[4] added d
rebasing to destination parent: ca1b80f7960a
computing new diff
committed as c41c793e0ef1
- recreate:[9] added c
+ recreate:[12] added c
atop:[3] added c
rebasing to destination parent: b1661037fa25
merging b
@@ -222,14 +217,20 @@
working directory is now at 28cd06b3f801
$ hg glog --hidden
- @ 9:28cd06b3f801 added c
+ @ 12:28cd06b3f801 added c
| () draft
- | x 8:9ff8adbe8a24 added c
+ | x 11:df2e1e03f9b3 temporary amend commit for 9ff8adbe8a24
+ | | () draft
+ | x 10:9ff8adbe8a24 added c
|/ () draft
- | o 7:e44ebefe4f54 added d
+ | o 9:e44ebefe4f54 added d
|/ () draft
- | x 6:ddba58020bc0 added d
+ | x 8:e8e0a6683006 temporary amend commit for ddba58020bc0
+ | | () draft
+ | x 7:ddba58020bc0 added d
|/ () draft
+ | x 6:7490b254b0eb temporary amend commit for cfe30edc6125
+ | | () draft
| x 5:cfe30edc6125 added d
|/ () draft
| o 4:c41c793e0ef1 added d
@@ -253,16 +254,24 @@
$ hg amend
$ hg glog --hidden
- @ 10:ef9b72b9b42c added d
+ @ 14:ef9b72b9b42c added d
| () draft
- | o 9:28cd06b3f801 added c
+ | x 13:8d4b16b17719 temporary amend commit for e44ebefe4f54
+ | | () draft
+ +---o 12:28cd06b3f801 added c
+ | | () draft
+ | | x 11:df2e1e03f9b3 temporary amend commit for 9ff8adbe8a24
+ | | | () draft
+ +---x 10:9ff8adbe8a24 added c
+ | | () draft
+ | x 9:e44ebefe4f54 added d
|/ () draft
- | x 8:9ff8adbe8a24 added c
+ | x 8:e8e0a6683006 temporary amend commit for ddba58020bc0
+ | | () draft
+ | x 7:ddba58020bc0 added d
|/ () draft
- | x 7:e44ebefe4f54 added d
- |/ () draft
- | x 6:ddba58020bc0 added d
- |/ () draft
+ | x 6:7490b254b0eb temporary amend commit for cfe30edc6125
+ | | () draft
| x 5:cfe30edc6125 added d
|/ () draft
| o 4:c41c793e0ef1 added d
@@ -277,7 +286,7 @@
() public
$ hg evolve --phase-divergent --all
- recreate:[9] added c
+ recreate:[12] added c
atop:[3] added c
rebasing to destination parent: b1661037fa25
merging b
@@ -290,10 +299,10 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- evolving 9:28cd06b3f801 "added c"
+ evolving 12:28cd06b3f801 "added c"
computing new diff
- committed as 95d746965290
- recreate:[10] added d
+ committed as a71c993be085
+ recreate:[14] added d
atop:[4] added d
rebasing to destination parent: ca1b80f7960a
merging c
@@ -306,16 +315,24 @@
working directory is now at ef9b72b9b42c
$ hg glog --hidden
- @ 10:ef9b72b9b42c added d
+ @ 14:ef9b72b9b42c added d
| () draft
- | o 9:28cd06b3f801 added c
+ | x 13:8d4b16b17719 temporary amend commit for e44ebefe4f54
+ | | () draft
+ +---o 12:28cd06b3f801 added c
+ | | () draft
+ | | x 11:df2e1e03f9b3 temporary amend commit for 9ff8adbe8a24
+ | | | () draft
+ +---x 10:9ff8adbe8a24 added c
+ | | () draft
+ | x 9:e44ebefe4f54 added d
|/ () draft
- | x 8:9ff8adbe8a24 added c
+ | x 8:e8e0a6683006 temporary amend commit for ddba58020bc0
+ | | () draft
+ | x 7:ddba58020bc0 added d
|/ () draft
- | x 7:e44ebefe4f54 added d
- |/ () draft
- | x 6:ddba58020bc0 added d
- |/ () draft
+ | x 6:7490b254b0eb temporary amend commit for cfe30edc6125
+ | | () draft
| x 5:cfe30edc6125 added d
|/ () draft
| o 4:c41c793e0ef1 added d
--- a/tests/test-evolve-content-divergence.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-content-divergence.t Thu Oct 25 16:33:10 2018 +0200
@@ -47,12 +47,12 @@
$ hg branch watwat
marked working directory as branch watwat
$ hg amend
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg glog
- @ 6:264b04f771fb added d
+ @ 8:264b04f771fb added d
| () [watwat] draft
- | o 5:bdeedce1f621 added d
+ | o 6:bdeedce1f621 added d
|/ () [foobar] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -66,17 +66,17 @@
$ hg evolve --content-divergent --config ui.interactive=True<<EOF
> c
> EOF
- merge:[6] added d
- with: [5] added d
+ merge:[8] added d
+ with: [6] added d
base: [4] added d
- merging "other" content-divergent changeset 'bdeedce1f621'
+ merging "other" divergent changeset 'bdeedce1f621'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
content divergent changesets on different branches.
choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c
working directory is now at 0ac42f1bc15c
$ hg glog
- @ 7:0ac42f1bc15c added d
+ @ 9:0ac42f1bc15c added d
| () [foobar] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -104,12 +104,12 @@
$ hg prune -r 0ac42f1bc15c -s . --hidden
1 changesets pruned
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg glog
- @ 9:59081c9c425a added a d with bar in it, expect some beers
+ @ 12:59081c9c425a added a d with bar in it, expect some beers
| () [default] draft
- | o 8:f621d00f5f0e added d
+ | o 11:f621d00f5f0e added d
|/ () [foobar] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -121,15 +121,15 @@
() [default] draft
$ hg evolve --content-divergent
- merge:[9] added a d with bar in it, expect some beers
- with: [8] added d
- base: [7] added d
- merging "other" content-divergent changeset 'f621d00f5f0e'
+ merge:[12] added a d with bar in it, expect some beers
+ with: [11] added d
+ base: [9] added d
+ merging "other" divergent changeset 'f621d00f5f0e'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at a9d6fd6b5e40
$ hg glog
- @ 10:a9d6fd6b5e40 added a d with bar in it, expect some beers
+ @ 13:a9d6fd6b5e40 added a d with bar in it, expect some beers
| () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -151,12 +151,12 @@
(use 'hg evolve' to update to its successor: b10b07a394f1)
$ echo babar > d
$ hg amend -m "foo to d"
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg glog
- @ 12:0bb497fed24a foo to d
+ @ 17:0bb497fed24a foo to d
| () [default] draft
- | o 11:b10b07a394f1 foo to d
+ | o 15:b10b07a394f1 foo to d
|/ () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -168,10 +168,10 @@
() [default] draft
$ hg evolve --content-divergent
- merge:[12] foo to d
- with: [11] foo to d
- base: [10] added a d with bar in it, expect some beers
- merging "other" content-divergent changeset 'b10b07a394f1'
+ merge:[17] foo to d
+ with: [15] foo to d
+ base: [13] added a d with bar in it, expect some beers
+ merging "other" divergent changeset 'b10b07a394f1'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -186,7 +186,7 @@
working directory is now at 11175423b5dc
$ hg glog
- @ 13:11175423b5dc foo to d
+ @ 18:11175423b5dc foo to d
| () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -209,12 +209,12 @@
(use 'hg evolve' to update to its successor: 27f0463f169a)
$ echo wat > d
$ hg amend -m "wat to d, wat?"
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg glog
- @ 15:f542037ddf31 wat to d, wat?
+ @ 22:f542037ddf31 wat to d, wat?
| () [default] draft
- | o 14:27f0463f169a bar to d, expect beers
+ | o 20:27f0463f169a bar to d, expect beers
|/ () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -226,10 +226,10 @@
() [default] draft
$ hg evolve --content-divergent
- merge:[15] wat to d, wat?
- with: [14] bar to d, expect beers
- base: [13] foo to d
- merging "other" content-divergent changeset '27f0463f169a'
+ merge:[22] wat to d, wat?
+ with: [20] bar to d, expect beers
+ base: [18] foo to d
+ merging "other" divergent changeset '27f0463f169a'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -267,7 +267,7 @@
working directory is now at 89ea3eee2d69
$ hg glog
- @ 16:89ea3eee2d69 watbar to d
+ @ 23:89ea3eee2d69 watbar to d
| () [default] draft
o 3:ca1b80f7960a added c
| () [default] draft
@@ -307,16 +307,16 @@
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo bar > b
$ hg amend
- 2 new orphan changesets
+ 2 new unstable changesets
- $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True
+ $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True
rebasing 2:b1661037fa25 "added b"
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg glog
- o 6:da4b96f4a8d6 added b
+ o 7:da4b96f4a8d6 added b
| () [default] draft
- | @ 5:7ed0642d644b added b
+ | @ 6:7ed0642d644b added b
| | () [default] draft
| | o 4:c41c793e0ef1 added d
| | | () [default] draft
@@ -330,17 +330,17 @@
() [default] draft
$ hg evolve --content-divergent
- merge:[5] added b
- with: [6] added b
+ merge:[6] added b
+ with: [7] added b
base: [2] added b
rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264
updating to "local" side of the conflict: 7ed0642d644b
- merging "other" content-divergent changeset '11f849d7159f'
+ merging "other" divergent changeset '11f849d7159f'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at 171614c9a791
$ hg glog
- @ 8:171614c9a791 added b
+ @ 9:171614c9a791 added b
| () [default] draft
| o 4:c41c793e0ef1 added d
| | () [default] draft
@@ -372,15 +372,15 @@
$ hg evolve --all
move:[3] added c
- atop:[8] added b
+ atop:[9] added b
move:[4] added d
working directory is now at 4ae4427ee9f8
$ hg glog
- @ 10:4ae4427ee9f8 added d
+ @ 11:4ae4427ee9f8 added d
| () [default] draft
- o 9:917281f93fcb added c
+ o 10:917281f93fcb added c
| () [default] draft
- o 8:171614c9a791 added b
+ o 9:171614c9a791 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -394,7 +394,7 @@
$ echo x > x
$ hg ci -Aqm "added x"
$ hg glog -r .
- @ 11:71a392c714b5 added x
+ @ 12:71a392c714b5 added x
| () [default] draft
~
@@ -408,20 +408,20 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (71a392c714b5)
(use 'hg evolve' to update to its successor: 1e1a50385a7d)
- $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True
- rebasing 11:71a392c714b5 "added x"
- 2 new content-divergent changesets
+ $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True
+ rebasing 12:71a392c714b5 "added x"
+ 2 new divergent changesets
$ hg glog
- @ 13:1e4f6b3bb39b added x
+ @ 15:1e4f6b3bb39b added x
| () [default] draft
- | o 12:1e1a50385a7d added foo to x
+ | o 14:1e1a50385a7d added foo to x
| | () [bar] draft
- o | 10:4ae4427ee9f8 added d
+ o | 11:4ae4427ee9f8 added d
| | () [default] draft
- o | 9:917281f93fcb added c
+ o | 10:917281f93fcb added c
|/ () [default] draft
- o 8:171614c9a791 added b
+ o 9:171614c9a791 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -429,12 +429,12 @@
() [default] draft
$ hg evolve --content-divergent
- merge:[13] added x
- with: [12] added foo to x
- base: [11] added x
+ merge:[15] added x
+ with: [14] added foo to x
+ base: [12] added x
rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8
updating to "local" side of the conflict: 1e4f6b3bb39b
- merging "other" content-divergent changeset '80cc9b1ec650'
+ merging "other" divergent changeset '80cc9b1ec650'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at b006cf317e0e
@@ -457,13 +457,13 @@
The above `hg exp` and the following log call demonstrates that message, content
and branch change is preserved in case of relocation
$ hg glog
- @ 15:b006cf317e0e added foo to x
+ @ 17:b006cf317e0e added foo to x
| () [bar] draft
- o 10:4ae4427ee9f8 added d
+ o 11:4ae4427ee9f8 added d
| () [default] draft
- o 9:917281f93fcb added c
+ o 10:917281f93fcb added c
| () [default] draft
- o 8:171614c9a791 added b
+ o 9:171614c9a791 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -480,7 +480,7 @@
$ echo y > y
$ hg ci -Aqm "added y"
$ hg glog -r .
- @ 16:fc6ad2bac162 added y
+ @ 18:fc6ad2bac162 added y
| () [default] draft
~
@@ -491,24 +491,24 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (fc6ad2bac162)
(use 'hg evolve' to update to its successor: 2a9f6ccbdeba)
- $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True
- rebasing 16:fc6ad2bac162 "added y"
- 2 new content-divergent changesets
+ $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True
+ rebasing 18:fc6ad2bac162 "added y"
+ 2 new divergent changesets
$ echo wat > y
$ hg amend
$ hg glog
- @ 19:b4575ed6fcfc added y
+ @ 23:b4575ed6fcfc added y
| () [bar] draft
- | o 17:2a9f6ccbdeba added y
+ | o 20:2a9f6ccbdeba added y
| | () [default] draft
- o | 15:b006cf317e0e added foo to x
+ o | 17:b006cf317e0e added foo to x
| | () [bar] draft
- o | 10:4ae4427ee9f8 added d
+ o | 11:4ae4427ee9f8 added d
| | () [default] draft
- o | 9:917281f93fcb added c
+ o | 10:917281f93fcb added c
|/ () [default] draft
- o 8:171614c9a791 added b
+ o 9:171614c9a791 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -516,12 +516,12 @@
() [default] draft
$ hg evolve --content-divergent
- merge:[19] added y
- with: [17] added y
- base: [16] added y
+ merge:[23] added y
+ with: [20] added y
+ base: [18] added y
rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e
updating to "local" side of the conflict: b4575ed6fcfc
- merging "other" content-divergent changeset '48f745db3f53'
+ merging "other" divergent changeset '48f745db3f53'
merging y
warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -536,15 +536,15 @@
working directory is now at 7bbcf24ddecf
$ hg glog
- @ 21:7bbcf24ddecf added y
+ @ 25:7bbcf24ddecf added y
| () [bar] draft
- o 15:b006cf317e0e added foo to x
+ o 17:b006cf317e0e added foo to x
| () [bar] draft
- o 10:4ae4427ee9f8 added d
+ o 11:4ae4427ee9f8 added d
| () [default] draft
- o 9:917281f93fcb added c
+ o 10:917281f93fcb added c
| () [default] draft
- o 8:171614c9a791 added b
+ o 9:171614c9a791 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -552,23 +552,23 @@
() [default] draft
$ hg obslog -r . --all
- @ 7bbcf24ddecf (21) added y
+ @ 7bbcf24ddecf (25) added y
|\
- x | 48f745db3f53 (20) added y
- | | rewritten(branch, content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ x | 48f745db3f53 (24) added y
+ | | rewritten(branch, content) as 7bbcf24ddecf by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- | x b4575ed6fcfc (19) added y
- | | rewritten(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ | x b4575ed6fcfc (23) added y
+ | | rewritten(content) as 7bbcf24ddecf by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- x | 2a9f6ccbdeba (17) added y
- | | rewritten(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ x | 2a9f6ccbdeba (20) added y
+ | | rewritten(parent) as 48f745db3f53 by test (Thu Jan 01 00:00:00 1970 +0000)
| |
- | x 96b677f01b81 (18) added y
- |/ rewritten(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | x 96b677f01b81 (21) added y
+ |/ rewritten(content) as b4575ed6fcfc by test (Thu Jan 01 00:00:00 1970 +0000)
|
- x fc6ad2bac162 (16) added y
- rewritten(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000)
- rewritten(branch, parent) as 96b677f01b81 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ x fc6ad2bac162 (18) added y
+ rewritten(content) as 2a9f6ccbdeba by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(branch, parent) as 96b677f01b81 by test (Thu Jan 01 00:00:00 1970 +0000)
checking that relocated commit is there
@@ -591,15 +591,15 @@
----------------------------------------------------------------------
$ hg glog
- @ 21:7bbcf24ddecf added y
+ @ 25:7bbcf24ddecf added y
| () [bar] draft
- o 15:b006cf317e0e added foo to x
+ o 17:b006cf317e0e added foo to x
| () [bar] draft
- o 10:4ae4427ee9f8 added d
+ o 11:4ae4427ee9f8 added d
| () [default] draft
- o 9:917281f93fcb added c
+ o 10:917281f93fcb added c
| () [default] draft
- o 8:171614c9a791 added b
+ o 9:171614c9a791 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -612,7 +612,7 @@
$ echo z > z
$ hg ci -Aqm "added z"
$ hg glog -r .
- @ 22:daf1de08f3b0 added z
+ @ 26:daf1de08f3b0 added z
| () [default] draft
~
@@ -624,26 +624,26 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
working directory parent is obsolete! (daf1de08f3b0)
(use 'hg evolve' to update to its successor: 3f7a1f693080)
- $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True
- rebasing 22:daf1de08f3b0 "added z"
- 2 new content-divergent changesets
+ $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True
+ rebasing 26:daf1de08f3b0 "added z"
+ 2 new divergent changesets
$ echo bar > z
$ hg amend
$ hg glog
- @ 25:53242575ffa9 added z
+ @ 31:53242575ffa9 added z
| () [bar] draft
- | o 23:3f7a1f693080 added z
+ | o 28:3f7a1f693080 added z
| | () [default] draft
- o | 21:7bbcf24ddecf added y
+ o | 25:7bbcf24ddecf added y
| | () [bar] draft
- o | 15:b006cf317e0e added foo to x
+ o | 17:b006cf317e0e added foo to x
| | () [bar] draft
- o | 10:4ae4427ee9f8 added d
+ o | 11:4ae4427ee9f8 added d
| | () [default] draft
- o | 9:917281f93fcb added c
+ o | 10:917281f93fcb added c
|/ () [default] draft
- o 8:171614c9a791 added b
+ o 9:171614c9a791 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -651,9 +651,9 @@
() [default] draft
$ hg evolve --content-divergent
- merge:[25] added z
- with: [23] added z
- base: [22] added z
+ merge:[31] added z
+ with: [28] added z
+ base: [26] added z
rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf
merging y
warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
@@ -682,9 +682,9 @@
continue: hg evolve --continue
$ hg evolve --continue
- evolving 23:3f7a1f693080 "added z"
+ evolving 28:3f7a1f693080 "added z"
updating to "local" side of the conflict: 53242575ffa9
- merging "other" content-divergent changeset 'cdb0643c69fc'
+ merging "other" divergent changeset 'cdb0643c69fc'
merging y
warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -710,17 +710,17 @@
working directory is now at 6fc7d9682de6
$ hg glog
- @ 27:6fc7d9682de6 added z
+ @ 33:6fc7d9682de6 added z
| () [bar] draft
- o 21:7bbcf24ddecf added y
+ o 25:7bbcf24ddecf added y
| () [bar] draft
- o 15:b006cf317e0e added foo to x
+ o 17:b006cf317e0e added foo to x
| () [bar] draft
- o 10:4ae4427ee9f8 added d
+ o 11:4ae4427ee9f8 added d
| () [default] draft
- o 9:917281f93fcb added c
+ o 10:917281f93fcb added c
| () [default] draft
- o 8:171614c9a791 added b
+ o 9:171614c9a791 added b
| () [default] draft
o 1:c7586e2a9264 added a
| () [default] draft
@@ -783,7 +783,6 @@
adding manifests
adding file changes
added 5 changesets with 5 changes to 5 files
- new changesets 8fa14d15e168:c41c793e0ef1
(run 'hg update' to get a working copy)
$ hg glog
o 4:c41c793e0ef1 added d
@@ -801,23 +800,23 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo bar > a
$ hg amend -m "watbar to a"
- 3 new orphan changesets
+ 3 new unstable changesets
$ echo wat > a
$ hg amend -m "watbar to a"
$ hg evolve --all
move:[2] added b
- atop:[6] watbar to a
+ atop:[8] watbar to a
move:[3] added c
move:[4] added d
working directory is now at 15c781f93cac
$ hg glog
- @ 9:15c781f93cac added d
+ @ 11:15c781f93cac added d
| () [default] draft
- o 8:9e5fb1d5b955 added c
+ o 10:9e5fb1d5b955 added c
| () [default] draft
- o 7:88516dccf68a added b
+ o 9:88516dccf68a added b
| () [default] draft
- o 6:82b74d5dc678 watbar to a
+ o 8:82b74d5dc678 watbar to a
| () [default] draft
o 0:8fa14d15e168 added hgignore
() [default] draft
@@ -827,21 +826,21 @@
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ echo wat > a
$ hg amend -m "watbar to a"
- 3 new orphan changesets
+ 3 new unstable changesets
$ hg evolve --all
move:[2] added b
- atop:[5] watbar to a
+ atop:[6] watbar to a
move:[3] added c
move:[4] added d
working directory is now at c72d2885eb51
$ hg glog
- @ 8:c72d2885eb51 added d
+ @ 9:c72d2885eb51 added d
| () [default] draft
- o 7:3ce4be6d8e5e added c
+ o 8:3ce4be6d8e5e added c
| () [default] draft
- o 6:d5f148423c16 added b
+ o 7:d5f148423c16 added b
| () [default] draft
- o 5:8e222f257bbf watbar to a
+ o 6:8e222f257bbf watbar to a
| () [default] draft
o 0:8fa14d15e168 added hgignore
() [default] draft
@@ -853,66 +852,65 @@
adding manifests
adding file changes
added 4 changesets with 0 changes to 4 files (+1 heads)
- 5 new obsolescence markers
- new changesets 82b74d5dc678:15c781f93cac
+ 7 new obsolescence markers
(run 'hg heads' to see heads, 'hg merge' to merge)
- 8 new content-divergent changesets
+ 8 new divergent changesets
$ hg glog
- o 12:15c781f93cac added d
+ o 13:15c781f93cac added d
| () [default] draft
- o 11:9e5fb1d5b955 added c
+ o 12:9e5fb1d5b955 added c
| () [default] draft
- o 10:88516dccf68a added b
+ o 11:88516dccf68a added b
| () [default] draft
- o 9:82b74d5dc678 watbar to a
+ o 10:82b74d5dc678 watbar to a
| () [default] draft
- | @ 8:c72d2885eb51 added d
+ | @ 9:c72d2885eb51 added d
| | () [default] draft
- | o 7:3ce4be6d8e5e added c
+ | o 8:3ce4be6d8e5e added c
| | () [default] draft
- | o 6:d5f148423c16 added b
+ | o 7:d5f148423c16 added b
| | () [default] draft
- | o 5:8e222f257bbf watbar to a
+ | o 6:8e222f257bbf watbar to a
|/ () [default] draft
o 0:8fa14d15e168 added hgignore
() [default] draft
$ hg evolve --all --content-divergent
- merge:[5] watbar to a
- with: [9] watbar to a
+ merge:[6] watbar to a
+ with: [10] watbar to a
base: [1] added a
updating to "local" side of the conflict: 8e222f257bbf
- merging "other" content-divergent changeset '82b74d5dc678'
+ merging "other" divergent changeset '82b74d5dc678'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- merge:[6] added b
- with: [10] added b
+ merge:[7] added b
+ with: [11] added b
base: [2] added b
updating to "local" side of the conflict: d5f148423c16
- merging "other" content-divergent changeset '88516dccf68a'
+ merging "other" divergent changeset '88516dccf68a'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- merge:[7] added c
- with: [11] added c
+ merge:[8] added c
+ with: [12] added c
base: [3] added c
updating to "local" side of the conflict: 3ce4be6d8e5e
- merging "other" content-divergent changeset '9e5fb1d5b955'
+ merging "other" divergent changeset '9e5fb1d5b955'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- merge:[8] added d
- with: [12] added d
+ merge:[9] added d
+ with: [13] added d
base: [4] added d
updating to "local" side of the conflict: c72d2885eb51
- merging "other" content-divergent changeset '15c781f93cac'
+ merging "other" divergent changeset '15c781f93cac'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at 038fe7db3d88
$ hg glog
- @ 16:038fe7db3d88 added d
+ @ 17:038fe7db3d88 added d
| () [default] draft
- o 15:b2cac10f3836 added c
+ o 16:b2cac10f3836 added c
| () [default] draft
- o 14:eadfd9d70680 added b
+ o 15:eadfd9d70680 added b
| () [default] draft
- o 13:f66f262fff6c watbar to a
+ o 14:f66f262fff6c watbar to a
| () [default] draft
o 0:8fa14d15e168 added hgignore
() [default] draft
--- a/tests/test-evolve-continue.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-continue.t Thu Oct 25 16:33:10 2018 +0200
@@ -38,9 +38,9 @@
$ echo bar > d
$ hg add d
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg glog
- @ 5:cb6a2ab625bb added c
+ @ 6:cb6a2ab625bb added c
| () draft
| o 4:c41c793e0ef1 added d
| | () draft
@@ -55,7 +55,7 @@
$ hg evolve --all
move:[4] added d
- atop:[5] added c
+ atop:[6] added c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -71,9 +71,9 @@
working directory is now at 2a4e03d422e2
$ hg glog
- @ 6:2a4e03d422e2 added d
+ @ 7:2a4e03d422e2 added d
| () draft
- o 5:cb6a2ab625bb added c
+ o 6:cb6a2ab625bb added c
| () draft
o 2:b1661037fa25 added b
| () draft
@@ -88,20 +88,20 @@
$ hg ci -Aqm "added e"
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- [6] added d
+ [7] added d
$ echo bar > e
$ hg add e
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg glog
- @ 8:00a5c774cc37 added d
+ @ 10:00a5c774cc37 added d
| () draft
- | o 7:ad0a59d83efe added e
+ | o 8:ad0a59d83efe added e
| | () draft
- | x 6:2a4e03d422e2 added d
+ | x 7:2a4e03d422e2 added d
|/ () draft
- o 5:cb6a2ab625bb added c
+ o 6:cb6a2ab625bb added c
| () draft
o 2:b1661037fa25 added b
| () draft
@@ -111,8 +111,8 @@
() draft
$ hg evolve
- move:[7] added e
- atop:[8] added d
+ move:[8] added e
+ atop:[10] added d
merging e
warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -125,13 +125,13 @@
$ hg diff
$ hg evolve --continue
- evolving 7:ad0a59d83efe "added e"
- evolution of 7:ad0a59d83efe created no changes to commit
+ evolving 8:ad0a59d83efe "added e"
+ evolution of 8:ad0a59d83efe created no changes to commit
$ hg glog
- @ 8:00a5c774cc37 added d
+ @ 10:00a5c774cc37 added d
| () draft
- o 5:cb6a2ab625bb added c
+ o 6:cb6a2ab625bb added c
| () draft
o 2:b1661037fa25 added b
| () draft
@@ -147,11 +147,11 @@
$ echo bar > b
$ hg add b
$ hg amend
- 3 new orphan changesets
+ 3 new unstable changesets
$ hg evolve --all
move:[2] added b
- atop:[9] added a
+ atop:[12] added a
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -163,19 +163,19 @@
continue: hg evolve --continue
$ hg evolve --continue
evolving 2:b1661037fa25 "added b"
- move:[5] added c
- atop:[10] added b
- move:[8] added d
+ move:[6] added c
+ atop:[13] added b
+ move:[10] added d
working directory is now at 6642d2c9176e
$ hg glog
- @ 12:6642d2c9176e added d
+ @ 15:6642d2c9176e added d
| () draft
- o 11:95665a2de664 added c
+ o 14:95665a2de664 added c
| () draft
- o 10:87f748868183 added b
+ o 13:87f748868183 added b
| () draft
- o 9:53b632d203d8 added a
+ o 12:53b632d203d8 added a
| () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -186,19 +186,19 @@
$ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done;
$ hg glog
- @ 15:09becba8f97d added h
+ @ 18:09becba8f97d added h
| () draft
- o 14:5aa7b2bbd944 added g
+ o 17:5aa7b2bbd944 added g
| () draft
- o 13:be88f889b6dc added f
+ o 16:be88f889b6dc added f
| () draft
- o 12:6642d2c9176e added d
+ o 15:6642d2c9176e added d
| () draft
- o 11:95665a2de664 added c
+ o 14:95665a2de664 added c
| () draft
- o 10:87f748868183 added b
+ o 13:87f748868183 added b
| () draft
- o 9:53b632d203d8 added a
+ o 12:53b632d203d8 added a
| () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -210,32 +210,32 @@
$ echo bar > h
$ hg add f h
$ hg amend
- 4 new orphan changesets
+ 4 new unstable changesets
$ hg glog
- @ 16:645135c5caa4 added c
+ @ 20:645135c5caa4 added c
| () draft
- | o 15:09becba8f97d added h
+ | o 18:09becba8f97d added h
| | () draft
- | o 14:5aa7b2bbd944 added g
+ | o 17:5aa7b2bbd944 added g
| | () draft
- | o 13:be88f889b6dc added f
+ | o 16:be88f889b6dc added f
| | () draft
- | o 12:6642d2c9176e added d
+ | o 15:6642d2c9176e added d
| | () draft
- | x 11:95665a2de664 added c
+ | x 14:95665a2de664 added c
|/ () draft
- o 10:87f748868183 added b
+ o 13:87f748868183 added b
| () draft
- o 9:53b632d203d8 added a
+ o 12:53b632d203d8 added a
| () draft
o 0:8fa14d15e168 added hgignore
() draft
$ hg evolve --all
- move:[12] added d
- atop:[16] added c
- move:[13] added f
+ move:[15] added d
+ atop:[20] added c
+ move:[16] added f
merging f
warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -246,10 +246,10 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- evolving 13:be88f889b6dc "added f"
- move:[14] added g
- atop:[18] added f
- move:[15] added h
+ evolving 16:be88f889b6dc "added f"
+ move:[17] added g
+ atop:[22] added f
+ move:[18] added h
merging h
warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -260,25 +260,25 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- evolving 15:09becba8f97d "added h"
+ evolving 18:09becba8f97d "added h"
working directory is now at 3ba9d3d1b089
Make sure, confirmopt is respected while continue
$ hg glog
- @ 20:3ba9d3d1b089 added h
+ @ 24:3ba9d3d1b089 added h
| () draft
- o 19:981e615b14ca added g
+ o 23:981e615b14ca added g
| () draft
- o 18:5794f1a3cbb2 added f
+ o 22:5794f1a3cbb2 added f
| () draft
- o 17:e47537da02b3 added d
+ o 21:e47537da02b3 added d
| () draft
- o 16:645135c5caa4 added c
+ o 20:645135c5caa4 added c
| () draft
- o 10:87f748868183 added b
+ o 13:87f748868183 added b
| () draft
- o 9:53b632d203d8 added a
+ o 12:53b632d203d8 added a
| () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -288,13 +288,13 @@
$ echo bar > g
$ hg add g
$ hg amend
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg evolve --all --confirm<<EOF
> y
> EOF
- move:[19] added g
- atop:[21] added f
+ move:[23] added g
+ atop:[26] added f
perform evolve? [Ny] y
merging g
warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
@@ -311,26 +311,26 @@
$ hg evolve --continue<<EOF
> y
> EOF
- evolving 19:981e615b14ca "added g"
- move:[20] added h
- atop:[22] added g
+ evolving 23:981e615b14ca "added g"
+ move:[24] added h
+ atop:[27] added g
perform evolve? [Ny] y
working directory is now at af6bd002a48d
$ hg glog
- @ 23:af6bd002a48d added h
+ @ 28:af6bd002a48d added h
| () draft
- o 22:d2c94a8f44bd added g
+ o 27:d2c94a8f44bd added g
| () draft
- o 21:9849fa96c885 added f
+ o 26:9849fa96c885 added f
| () draft
- o 17:e47537da02b3 added d
+ o 21:e47537da02b3 added d
| () draft
- o 16:645135c5caa4 added c
+ o 20:645135c5caa4 added c
| () draft
- o 10:87f748868183 added b
+ o 13:87f748868183 added b
| () draft
- o 9:53b632d203d8 added a
+ o 12:53b632d203d8 added a
| () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -341,11 +341,11 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo foobar > g
$ hg amend
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg next --evolve
- move:[22] added g
- atop:[24] added f
+ move:[27] added g
+ atop:[30] added f
merging g
warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -355,4 +355,4 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- evolving 22:d2c94a8f44bd "added g"
+ evolving 27:d2c94a8f44bd "added g"
--- a/tests/test-evolve-cycles.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-cycles.t Thu Oct 25 16:33:10 2018 +0200
@@ -50,7 +50,7 @@
Create a cycle
$ hg prune -s "desc(B)" "desc(A)"
1 changesets pruned
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg prune -s "desc(C)" "desc(B)"
1 changesets pruned
$ hg prune -s "desc(A)" "desc(C)"
@@ -62,19 +62,19 @@
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using prune as 1:2a34000d3544
+ | obsolete: rewritten as 2a34000d3544
| summary: C
|
x changeset: 2:c473644ee0e9
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using prune as 3:a8df460dbbfe
+ | obsolete: rewritten as a8df460dbbfe
| summary: B
|
@ changeset: 1:2a34000d3544
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using prune as 2:c473644ee0e9
+ | obsolete: rewritten as c473644ee0e9
| summary: A
|
o changeset: 0:ea207398892e
@@ -89,48 +89,48 @@
$ hg obslog "desc(A)" --hidden
@ 2a34000d3544 (1) A
- | rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x a8df460dbbfe (3) C
- | rewritten(description, parent, content) as 2a34000d3544 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x c473644ee0e9 (2) B
- | rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
|
$ hg obslog "desc(B)" --hidden
@ 2a34000d3544 (1) A
- | rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x a8df460dbbfe (3) C
- | rewritten(description, parent, content) as 2a34000d3544 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x c473644ee0e9 (2) B
- | rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
|
$ hg obslog "desc(C)" --hidden
@ 2a34000d3544 (1) A
- | rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x a8df460dbbfe (3) C
- | rewritten(description, parent, content) as 2a34000d3544 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x c473644ee0e9 (2) B
- | rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
|
Check that all option don't crash on a cycle either
$ hg obslog "desc(C)" --hidden --all
@ 2a34000d3544 (1) A
- | rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x a8df460dbbfe (3) C
- | rewritten(description, parent, content) as 2a34000d3544 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as 2a34000d3544 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x c473644ee0e9 (2) B
- | rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
|
Test with multiple cyles
@@ -188,7 +188,7 @@
Create a first cycle
$ hg prune -s "desc(B)" "desc(A)"
1 changesets pruned
- 5 new orphan changesets
+ 5 new unstable changesets
$ hg prune -s "desc(C)" "desc(B)"
1 changesets pruned
$ hg prune --split -s "desc(A)" -s "desc(D)" "desc(C)"
@@ -207,37 +207,37 @@
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using prune as 4:868d2e0eb19c
+ | obsolete: rewritten as 868d2e0eb19c
| summary: F
|
x changeset: 5:0da815c333f6
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using prune as 6:d9f908fde1a1
+ | obsolete: rewritten as d9f908fde1a1
| summary: E
|
@ changeset: 4:868d2e0eb19c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using prune as 5:0da815c333f6
+ | obsolete: rewritten as 0da815c333f6
| summary: D
|
x changeset: 3:a8df460dbbfe
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split using prune as 1:2a34000d3544, 4:868d2e0eb19c
+ | obsolete: split as 2a34000d3544, 868d2e0eb19c
| summary: C
|
x changeset: 2:c473644ee0e9
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using prune as 3:a8df460dbbfe
+ | obsolete: rewritten as a8df460dbbfe
| summary: B
|
x changeset: 1:2a34000d3544
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using prune as 2:c473644ee0e9
+ | obsolete: rewritten as c473644ee0e9
| summary: A
|
o changeset: 0:ea207398892e
@@ -252,42 +252,42 @@
$ hg obslog "desc(D)" --hidden
x 0da815c333f6 (5) E
- | rewritten(description, parent, content) as d9f908fde1a1 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000)
|
@ 868d2e0eb19c (4) D
- |\ rewritten(description, parent, content) as 0da815c333f6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ rewritten(description, parent, content) as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x d9f908fde1a1 (6) F
- | | rewritten(description, parent, content) as 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
| |
+---x 2a34000d3544 (1) A
- | | rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | a8df460dbbfe (3) C
- | | rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | c473644ee0e9 (2) B
- | | rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
| |
Check that all option don't crash either on a cycle
$ hg obslog --all --hidden "desc(F)"
x 0da815c333f6 (5) E
- | rewritten(description, parent, content) as d9f908fde1a1 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as d9f908fde1a1 by test (Thu Jan 01 00:00:00 1970 +0000)
|
@ 868d2e0eb19c (4) D
- |\ rewritten(description, parent, content) as 0da815c333f6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ rewritten(description, parent, content) as 0da815c333f6 by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x d9f908fde1a1 (6) F
- | | rewritten(description, parent, content) as 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
| |
+---x 2a34000d3544 (1) A
- | | rewritten(description, parent, content) as c473644ee0e9 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as c473644ee0e9 by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | a8df460dbbfe (3) C
- | | rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as 2a34000d3544, 868d2e0eb19c by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | c473644ee0e9 (2) B
- | | rewritten(description, parent, content) as a8df460dbbfe using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | rewritten(description, parent, content) as a8df460dbbfe by test (Thu Jan 01 00:00:00 1970 +0000)
| |
Check the json output is valid in this case
@@ -301,11 +301,10 @@
0
],
"effect": [
- "description",
- "parent",
+ *, (glob)
+ *, (glob)
"content"
],
- "operation": "prune",
"succnodes": [
"0da815c333f6"
],
@@ -325,11 +324,10 @@
0
],
"effect": [
- "description",
- "parent",
+ *, (glob)
+ *, (glob)
"content"
],
- "operation": "prune",
"succnodes": [
"868d2e0eb19c"
],
@@ -345,7 +343,7 @@
"markers": [
{
"date": [
- *, (glob)
+ 0.0,
0
],
"effect": [
@@ -353,7 +351,6 @@
"parent",
"content"
],
- "operation": "prune",
"succnodes": [
"d9f908fde1a1"
],
@@ -369,7 +366,7 @@
"markers": [
{
"date": [
- *, (glob)
+ 0.0,
0
],
"effect": [
@@ -377,7 +374,6 @@
"parent",
"content"
],
- "operation": "prune",
"succnodes": [
"2a34000d3544",
"868d2e0eb19c"
@@ -394,7 +390,7 @@
"markers": [
{
"date": [
- *, (glob)
+ 0.0,
0
],
"effect": [
@@ -402,7 +398,6 @@
"parent",
"content"
],
- "operation": "prune",
"succnodes": [
"a8df460dbbfe"
],
@@ -418,7 +413,7 @@
"markers": [
{
"date": [
- *, (glob)
+ 0.0,
0
],
"effect": [
@@ -426,7 +421,6 @@
"parent",
"content"
],
- "operation": "prune",
"succnodes": [
"c473644ee0e9"
],
--- a/tests/test-evolve-effectflags.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-effectflags.t Thu Oct 25 16:33:10 2018 +0200
@@ -29,18 +29,18 @@
check result
$ hg debugobsolete --rev .
- 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
+ 471f378eab4c5e25f6c77f785b27c936efb22874 fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e 0 (*) {'ef1': '1', 'user': 'test'} (glob)
$ hg obslog .
@ fdf9bde5129a (2) A1
|
x 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg log --hidden -r "desc(A0)"
changeset: 1:471f378eab4c
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: reworded using amend as 2:fdf9bde5129a
+ obsolete: reworded as fdf9bde5129a
summary: A0
@@ -53,18 +53,18 @@
check result
$ hg debugobsolete --rev .
- ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '16', 'operation': 'amend', 'user': 'test'}
+ ef4a313b1e0ade55718395d80e6b88c5ccd875eb 5485c92d34330dac9d7a63dc07e1e3373835b964 0 (*) {'ef1': '16', 'user': 'test'} (glob)
$ hg obslog .
@ 5485c92d3433 (4) B0
|
x ef4a313b1e0a (3) B0
- rewritten(user) as 5485c92d3433 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(user) as 5485c92d3433 by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg log --hidden -r "ef4a313b1e0a"
changeset: 3:ef4a313b1e0a
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: reauthored using amend as 4:5485c92d3433
+ obsolete: reauthored as 5485c92d3433
summary: B0
@@ -77,18 +77,18 @@
check result
$ hg debugobsolete --rev .
- 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'amend', 'user': 'test'}
+ 2ef0680ff45038ac28c9f1ff3644341f54487280 4dd84345082e9e5291c2e6b3f335bbf8bf389378 0 (*) {'ef1': '32', 'user': 'test'} (glob)
$ hg obslog .
@ 4dd84345082e (6) B1
|
x 2ef0680ff450 (5) B1
- rewritten(date) as 4dd84345082e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(date) as 4dd84345082e by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg log --hidden -r "2ef0680ff450"
changeset: 5:2ef0680ff450
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: date-changed using amend as 6:4dd84345082e
+ obsolete: date-changed as 4dd84345082e
summary: B1
@@ -104,18 +104,19 @@
check result
$ hg debugobsolete --rev .
- bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '64', 'operation': 'amend', 'user': 'test'}
+ 4d1430a201c1ffbd8465dec75edd4a691a2d97ec 0 {bd3db8264ceebf1966319f5df3be7aac6acd1a8e} (*) {'ef1': '0', 'user': 'test'} (glob)
+ bd3db8264ceebf1966319f5df3be7aac6acd1a8e 14a01456e0574f0e0a0b15b2345486a6364a8d79 0 (*) {'ef1': '64', 'user': 'test'} (glob)
$ hg obslog .
- @ 14a01456e057 (8) B2
+ @ 14a01456e057 (9) B2
|
x bd3db8264cee (7) B2
- rewritten(branch) as 14a01456e057 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(branch) as 14a01456e057 by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg log --hidden -r "bd3db8264cee"
changeset: 7:bd3db8264cee
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: branch-changed using amend as 8:14a01456e057
+ obsolete: branch-changed as 14a01456e057
summary: B2
@@ -128,23 +129,23 @@
$ mkcommit C0
$ mkcommit D0
$ hg rebase -r . -d 'desc(B0)'
- rebasing 10:c85eff83a034 "D0" (tip)
+ rebasing 11:c85eff83a034 "D0" (tip)
check result
$ hg debugobsolete --rev .
- c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+ c85eff83a0340efd9da52b806a94c350222f3371 da86aa2f19a30d6686b15cae15c7b6c908ec9699 0 (*) {'ef1': '4', 'user': 'test'} (glob)
$ hg obslog .
- @ da86aa2f19a3 (11) D0
+ @ da86aa2f19a3 (12) D0
|
- x c85eff83a034 (10) D0
- rewritten(parent) as da86aa2f19a3 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ x c85eff83a034 (11) D0
+ rewritten(parent) as da86aa2f19a3 by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg log --hidden -r "c85eff83a034"
- changeset: 10:c85eff83a034
+ changeset: 11:c85eff83a034
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: rebased using rebase as 11:da86aa2f19a3
+ obsolete: rebased as da86aa2f19a3
summary: D0
@@ -158,18 +159,19 @@
check result
$ hg debugobsolete --rev .
- ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+ d6f4d8b8d3c8cde990f13915bced7f92ce1cc54f 0 {ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f} (*) {'ef1': '0', 'user': 'test'} (glob)
+ ebfe0333e0d96f68a917afd97c0a0af87f1c3b5f 75781fdbdbf58a987516b00c980bccda1e9ae588 0 (*) {'ef1': '8', 'user': 'test'} (glob)
$ hg obslog .
- @ 75781fdbdbf5 (13) E0
+ @ 75781fdbdbf5 (15) E0
|
- x ebfe0333e0d9 (12) E0
- rewritten(content) as 75781fdbdbf5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ x ebfe0333e0d9 (13) E0
+ rewritten(content) as 75781fdbdbf5 by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg log --hidden -r "ebfe0333e0d9"
- changeset: 12:ebfe0333e0d9
+ changeset: 13:ebfe0333e0d9
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: amended using amend as 13:75781fdbdbf5
+ obsolete: amended as 75781fdbdbf5
summary: E0
@@ -184,18 +186,19 @@
check result
$ hg debugobsolete --rev .
- fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '113', 'operation': 'amend', 'user': 'test'}
+ 3b12912003b4e7aa6df6cded86255006c3c29d27 0 {fad47e5bd78e6aa4db1b5a0a1751bc12563655ff} (*) {'ef1': '0', 'user': 'test'} (glob)
+ fad47e5bd78e6aa4db1b5a0a1751bc12563655ff a94e0fd5f1c81d969381a76eb0d37ce499a44fae 0 (*) {'ef1': '113', 'user': 'test'} (glob)
$ hg obslog .
- @ a94e0fd5f1c8 (15) F1
+ @ a94e0fd5f1c8 (18) F1
|
- x fad47e5bd78e (14) F0
- rewritten(description, user, date, branch) as a94e0fd5f1c8 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ x fad47e5bd78e (16) F0
+ rewritten(description, user, date, branch) as a94e0fd5f1c8 by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg log --hidden -r "fad47e5bd78e"
- changeset: 14:fad47e5bd78e
+ changeset: 16:fad47e5bd78e
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: rewritten using amend as 15:a94e0fd5f1c8
+ obsolete: rewritten as a94e0fd5f1c8
summary: F0
@@ -238,20 +241,20 @@
$ hg commit -m "H2"
created new head
$ hg rebase -s "desc(H1)" -d "desc(H2)" -t :merge3
- rebasing 17:b57fed8d8322 "H1"
+ rebasing 20:b57fed8d8322 "H1"
merging H0
$ hg obslog tip
- o e509e2eb3df5 (19) H1
+ o e509e2eb3df5 (22) H1
|
- x b57fed8d8322 (17) H1
- rewritten(parent) as e509e2eb3df5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ x b57fed8d8322 (20) H1
+ rewritten(parent) as e509e2eb3df5 by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg log --hidden -r "b57fed8d8322"
- changeset: 17:b57fed8d8322
+ changeset: 20:b57fed8d8322
branch: my-other-branch
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: rebased using rebase as 19:e509e2eb3df5
+ obsolete: rebased as e509e2eb3df5
summary: H1
amend closing the branch should be detected as meta change
@@ -266,16 +269,16 @@
check result
$ hg obslog .
- @ 12c6238b5e37 (22) I0
+ @ 12c6238b5e37 (26) I0
|
- x 2f599e54c1c6 (21) I0
- rewritten(meta) as 12c6238b5e37 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ x 2f599e54c1c6 (24) I0
+ rewritten(meta) as 12c6238b5e37 by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg log --hidden -r "2f599e54c1c6"
- changeset: 21:2f599e54c1c6
+ changeset: 24:2f599e54c1c6
branch: closedbranch
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: meta-changed using amend as 22:12c6238b5e37
+ obsolete: meta-changed as 12c6238b5e37
summary: I0
--- a/tests/test-evolve-issue5832.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-issue5832.t Thu Oct 25 16:33:10 2018 +0200
@@ -52,7 +52,7 @@
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ echo foo > a
$ hg amend
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg up bde1d2b6b5e5
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -63,11 +63,11 @@
$ echo d > d
$ hg ci -Aqm "added d"
$ hg glog
- @ 7:5841d7cf9893 added d
+ @ 8:5841d7cf9893 added d
| () draft
- | o 6:62fb70414f99 added c
+ | o 7:62fb70414f99 added c
|/ () draft
- | o 5:7014ec2829cd added a
+ | o 6:7014ec2829cd added a
|/ () draft
| o 4:b9b387427a53 merge commit
| |\ () draft
@@ -84,11 +84,11 @@
1 changesets pruned
$ hg glog
- @ 7:5841d7cf9893 added d
+ @ 8:5841d7cf9893 added d
| () draft
- | o 6:62fb70414f99 added c
+ | o 7:62fb70414f99 added c
|/ () draft
- | o 5:7014ec2829cd added a
+ | o 6:7014ec2829cd added a
|/ () draft
| o 4:b9b387427a53 merge commit
| |\ () draft
@@ -105,7 +105,7 @@
$ hg evolve --dry-run --any --all
move:[2] added b
- atop:[5] added a
+ atop:[6] added a
hg rebase -r a1da0651488c -d 7014ec2829cd
could not solve instability, ambiguous destination: parent split across two branches
@@ -115,7 +115,7 @@
> 0
> EOF
move:[2] added b
- atop:[5] added a
+ atop:[6] added a
move:[4] merge commit
ancestor '7235ef625ea3' split over multiple topological branches.
choose an evolve destination:
@@ -123,20 +123,20 @@
1: [5841d7cf9893] added d
q: quit the prompt
enter the index of the revision you want to select: 0
- move:[9] merge commit
- atop:[6] added c
+ move:[10] merge commit
+ atop:[7] added c
working directory is now at 28a0775ac832
$ hg glog
- @ 10:28a0775ac832 merge commit
+ @ 11:28a0775ac832 merge commit
|\ () draft
- | o 8:2baf8bae7ea4 added b
+ | o 9:2baf8bae7ea4 added b
| | () draft
- | | o 7:5841d7cf9893 added d
+ | | o 8:5841d7cf9893 added d
| | | () draft
- o---+ 6:62fb70414f99 added c
+ o---+ 7:62fb70414f99 added c
/ / () draft
- o / 5:7014ec2829cd added a
+ o / 6:7014ec2829cd added a
|/ () draft
o 0:bde1d2b6b5e5 added base
() draft
--- a/tests/test-evolve-list.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-list.t Thu Oct 25 16:33:10 2018 +0200
@@ -17,13 +17,13 @@
$ hg up 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo a >> a && hg ci --amend -m a
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg evolve --list
d2ae7f538514: b
- orphan: cb9a9f314b8b (obsolete parent)
+ unstable: cb9a9f314b8b (obsolete parent)
177f92b77385: c
- orphan: d2ae7f538514 (orphan parent)
+ unstable: d2ae7f538514 (unstable parent)
$ cd ..
@@ -34,10 +34,10 @@
adding a
$ echo b > b && hg ci --amend -m ab
$ hg phase --public --rev 0 --hidden
- 1 new phase-divergent changesets
+ 1 new bumped changesets
$ hg evolve --list
88cc282e27fc: ab
- phase-divergent: cb9a9f314b8b (immutable precursor)
+ bumped: cb9a9f314b8b (immutable precursor)
$ cd ..
@@ -64,21 +64,21 @@
rebasing 1:d2ae7f538514 "b"
$ hg rebase -s 1 -d 3 --hidden --config experimental.allowdivergence=True
rebasing 1:d2ae7f538514 "b"
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg evolve --list
c882616e9d84: b
- content-divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
+ divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
a922b3733e98: b
- content-divergent: c882616e9d84 (draft) (precursor d2ae7f538514)
+ divergent: c882616e9d84 (draft) (precursor d2ae7f538514)
$ hg evolve --list --rev c882616e9d84
c882616e9d84: b
- content-divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
+ divergent: a922b3733e98 (draft) (precursor d2ae7f538514)
$ hg phase -p a922b3733e98
$ hg evolve --list
c882616e9d84: b
- content-divergent: a922b3733e98 (public) (precursor d2ae7f538514)
+ divergent: a922b3733e98 (public) (precursor d2ae7f538514)
$ cd ..
--- a/tests/test-evolve-noupdate.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-noupdate.t Thu Oct 25 16:33:10 2018 +0200
@@ -44,9 +44,9 @@
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo bar > b
$ hg amend
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg glog
- @ 5:7ed0642d644b added b
+ @ 6:7ed0642d644b added b
| () draft
| o 4:c41c793e0ef1 added d
| | () draft
@@ -62,15 +62,15 @@
There is 'working directory is now at' message because it didnt changed
$ hg evolve --all --no-update
move:[3] added c
- atop:[5] added b
+ atop:[6] added b
move:[4] added d
$ hg glog
- o 7:b6b20b8eefdc added d
+ o 8:b6b20b8eefdc added d
| () draft
- o 6:7c46f743e62f added c
+ o 7:7c46f743e62f added c
| () draft
- @ 5:7ed0642d644b added b
+ @ 6:7ed0642d644b added b
| () draft
o 1:c7586e2a9264 added a
| () draft
@@ -85,18 +85,18 @@
[1] added a
$ echo bar > a
$ hg amend
- 3 new orphan changesets
+ 3 new unstable changesets
$ hg up 7ed0642d644b
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg glog
- o 8:3d41537b44ca added a
+ o 10:3d41537b44ca added a
| () draft
- | o 7:b6b20b8eefdc added d
+ | o 8:b6b20b8eefdc added d
| | () draft
- | o 6:7c46f743e62f added c
+ | o 7:7c46f743e62f added c
| | () draft
- | @ 5:7ed0642d644b added b
+ | @ 6:7ed0642d644b added b
| | () draft
| x 1:c7586e2a9264 added a
|/ () draft
@@ -104,20 +104,20 @@
() draft
$ hg evolve --all --any --no-update
- move:[5] added b
- atop:[8] added a
- move:[6] added c
- move:[7] added d
+ move:[6] added b
+ atop:[10] added a
+ move:[7] added c
+ move:[8] added d
working directory is now at 12c720cb3782
$ hg glog
- o 11:a74d9f22ba3f added d
+ o 13:a74d9f22ba3f added d
| () draft
- o 10:958f5155e8cd added c
+ o 12:958f5155e8cd added c
| () draft
- @ 9:12c720cb3782 added b
+ @ 11:12c720cb3782 added b
| () draft
- o 8:3d41537b44ca added a
+ o 10:3d41537b44ca added a
| () draft
o 0:8fa14d15e168 added hgignore
() draft
--- a/tests/test-evolve-obshistory-amend-then-fold.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-obshistory-amend-then-fold.t Thu Oct 25 16:33:10 2018 +0200
@@ -29,7 +29,7 @@
| x changeset: 2:0dec01379d3b
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 3:b7ea6d14e664
+ | obsolete: reworded as b7ea6d14e664
| summary: B0
|
o changeset: 1:471f378eab4c
@@ -57,19 +57,19 @@
| | parent: 1:471f378eab4c
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten using fold as 4:eb5a0daa2192
+ | | obsolete: rewritten as eb5a0daa2192
| | summary: B1
| |
| | x changeset: 2:0dec01379d3b
| |/ user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: reworded using amend as 3:b7ea6d14e664
+ | | obsolete: reworded as b7ea6d14e664
| | summary: B0
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using fold as 4:eb5a0daa2192
+ | obsolete: rewritten as eb5a0daa2192
| summary: A0
|
o changeset: 0:ea207398892e
@@ -85,7 +85,7 @@
@ eb5a0daa2192 (4) C0
|\
x | 471f378eab4c (1) A0
- / rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
@@ -101,11 +101,11 @@
|
|
x b7ea6d14e664 (3) B1
- | rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 0dec01379d3b (2) B0
- rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -119,7 +119,7 @@
@ eb5a0daa2192 (4) C0
|\
x | 471f378eab4c (1) A0
- / rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
@@ -135,11 +135,11 @@
|
|
x b7ea6d14e664 (3) B1
- | rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 0dec01379d3b (2) B0
- rewritten(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as b7ea6d14e664 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -168,7 +168,6 @@
*, (glob)
"content"
],
- "operation": "fold",
"succnodes": [
"eb5a0daa2192"
],
@@ -184,13 +183,12 @@
"markers": [
{
"date": [
- *, (glob)
+ 0.0,
0 (glob)
],
"effect": [
"description"
],
- "operation": "amend",
"succnodes": [
"b7ea6d14e664"
],
@@ -206,14 +204,13 @@
"markers": [
{
"date": [
- *, (glob)
+ 0.0,
0 (glob)
],
"effect": [
"description",
"content"
],
- "operation": "fold",
"succnodes": [
"eb5a0daa2192"
],
--- a/tests/test-evolve-obshistory-amend.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-obshistory-amend.t Thu Oct 25 16:33:10 2018 +0200
@@ -25,17 +25,23 @@
> Better commit message"
$ sync
$ hg log --hidden -G
- @ changeset: 2:4ae3a4151de9
+ @ changeset: 3:4ae3a4151de9
| tag: tip
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: A1
|
+ | x changeset: 2:f137d23bb3e1
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | obsolete: pruned
+ | | summary: temporary amend commit for 471f378eab4c
+ | |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using amend as 2:4ae3a4151de9
+ | obsolete: rewritten as 4ae3a4151de9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -46,10 +52,10 @@
Check output on the client side
-------------------------------
$ hg obslog --patch 4ae3a4151de9
- @ 4ae3a4151de9 (2) A1
+ @ 4ae3a4151de9 (3) A1
|
x 471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 using amend by test (*) (glob)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -68,10 +74,10 @@
$ hg obslog --patch --color debug
- @ [evolve.node|4ae3a4151de9] [evolve.rev|(2)] [evolve.short_description|A1]
+ @ [evolve.node|4ae3a4151de9] [evolve.rev|(3)] [evolve.short_description|A1]
|
x [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
- [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+ [evolve.verb|rewritten](description, content) as [evolve.node|4ae3a4151de9] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
[diff.diffline|diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description]
[diff.file_a|--- a/changeset-description]
[diff.file_b|+++ b/changeset-description]
@@ -91,9 +97,9 @@
$ hg obslog --no-graph --patch 4ae3a4151de9
- 4ae3a4151de9 (2) A1
+ 4ae3a4151de9 (3) A1
471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -121,7 +127,7 @@
{
"markers": [],
"node": "4ae3a4151de9",
- "rev": 2,
+ "rev": 3,
"shortdescription": "A1"
},
{
@@ -135,7 +141,6 @@
"description",
"content"
],
- "operation": "amend",
"succnodes": [
"4ae3a4151de9"
],
@@ -150,7 +155,7 @@
]
$ hg obslog --hidden --patch 471f378eab4c
x 471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -181,7 +186,6 @@
*, (glob)
"content"
],
- "operation": "amend",
"succnodes": [
"4ae3a4151de9"
],
@@ -210,7 +214,7 @@
o 4ae3a4151de9 (1) A1
|
x 471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
$ hg obslog -R $TESTTMP/server -f --patch 4ae3a4151de9
@@ -219,13 +223,13 @@
$ hg obslog -R $TESTTMP/server --no-graph --patch 4ae3a4151de9
4ae3a4151de9 (1) A1
471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
$ hg obslog -R $TESTTMP/server --no-graph -f --patch 4ae3a4151de9
4ae3a4151de9 (1) A1
471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
Amend two more times
@@ -234,17 +238,23 @@
Amend again
-----------
$ hg log --hidden -G
- o changeset: 2:4ae3a4151de9
+ o changeset: 3:4ae3a4151de9
| tag: tip
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: A1
|
+ | x changeset: 2:f137d23bb3e1
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | obsolete: pruned
+ | | summary: temporary amend commit for 471f378eab4c
+ | |
| @ changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using amend as 2:4ae3a4151de9
+ | obsolete: rewritten as 4ae3a4151de9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -262,31 +272,37 @@
> Better better better commit message"
$ sync
$ hg log --hidden -G
- @ changeset: 4:92210308515b
+ @ changeset: 5:92210308515b
| tag: tip
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: A3
|
- | x changeset: 3:4f1685185907
+ | x changeset: 4:4f1685185907
+ |/ parent: 0:ea207398892e
+ | user: test
+ | date: Thu Jan 01 00:00:00 1970 +0000
+ | obsolete: reworded as 92210308515b
+ | summary: A2
+ |
+ | x changeset: 3:4ae3a4151de9
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 4:92210308515b
- | summary: A2
- |
- | x changeset: 2:4ae3a4151de9
- |/ parent: 0:ea207398892e
- | user: test
- | date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 3:4f1685185907
+ | obsolete: reworded as 4f1685185907
| summary: A1
|
+ | x changeset: 2:f137d23bb3e1
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | obsolete: pruned
+ | | summary: temporary amend commit for 471f378eab4c
+ | |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using amend as 2:4ae3a4151de9
+ | obsolete: rewritten as 4ae3a4151de9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -298,10 +314,10 @@
------------------------------
$ hg obslog --patch 92210308515b
- @ 92210308515b (4) A3
+ @ 92210308515b (5) A3
|
- x 4f1685185907 (3) A2
- | rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ x 4f1685185907 (4) A2
+ | rewritten(description) as 92210308515b by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 4f1685185907 -r 92210308515b changeset-description
| --- a/changeset-description
| +++ b/changeset-description
@@ -313,8 +329,8 @@
| +Better better better commit message
|
|
- x 4ae3a4151de9 (2) A1
- | rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ x 4ae3a4151de9 (3) A1
+ | rewritten(description) as 4f1685185907 by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r 4ae3a4151de9 -r 4f1685185907 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
@@ -327,7 +343,7 @@
|
|
x 471f378eab4c (1) A0
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 4ae3a4151de9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -352,53 +368,42 @@
o 92210308515b (2) A3
|
x 4f1685185907
- | rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description) as 92210308515b by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, context is not local)
|
x 4ae3a4151de9 (1) A1
- | rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description) as 4f1685185907 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, successor is unknown locally)
|
x 471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
$ hg obslog -R $TESTTMP/server -f --patch 92210308515b
o 92210308515b (2) A3
|
x 4ae3a4151de9 (1) A1
- reworded(description) as 92210308515b using amend by test (at Thu Jan 01 00:00:00 1970 +0000)
- diff -r 4ae3a4151de9 -r 92210308515b changeset-description
- --- a/changeset-description
- +++ b/changeset-description
- @@ -1,3 +1,3 @@
- -A1
- +A3
-
- -Better commit message
- +Better better better commit message
-
$ hg obslog -R $TESTTMP/server --no-graph --patch 92210308515b
92210308515b (2) A3
4f1685185907
- rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 92210308515b by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
4ae3a4151de9 (1) A1
- rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 4f1685185907 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, successor is unknown locally)
471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
$ hg obslog -R $TESTTMP/server --no-graph -f --patch 92210308515b
92210308515b (2) A3
4f1685185907
- rewritten(description) as 92210308515b using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 92210308515b by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
4ae3a4151de9 (1) A1
- rewritten(description) as 4f1685185907 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 4f1685185907 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, successor is unknown locally)
471f378eab4c
- rewritten(description, content) as 4ae3a4151de9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as 4ae3a4151de9 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, context is not local)
--- a/tests/test-evolve-obshistory-complex.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-obshistory-complex.t Thu Oct 25 16:33:10 2018 +0200
@@ -68,21 +68,22 @@
$ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0"
2 changesets folded
- 4 new orphan changesets
+ 4 new unstable changesets
$ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1"
2 changesets folded
$ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test"
+ current hg version does not support storing note in obsmarker
2 changesets folded
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg obslog -r .
@ 100cc25b765f (9) fold2
|\
x | 0da815c333f6 (5) E
- / rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
| note: folding changesets to test
|
x d9f908fde1a1 (6) F
- rewritten(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
note: folding changesets to test
$ hg log -G
@@ -91,14 +92,14 @@
| parent: 4:868d2e0eb19c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: orphan
+ | trouble: unstable
| summary: fold2
|
| o changeset: 8:d15d0ffc75f6
| | parent: 2:c473644ee0e9
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan
+ | | trouble: unstable
| | summary: fold1
| |
| | o changeset: 7:b868bc49b0a4
@@ -110,25 +111,25 @@
x | | changeset: 4:868d2e0eb19c
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: rewritten using fold as 8:d15d0ffc75f6
+ | | | obsolete: rewritten as d15d0ffc75f6
| | | summary: D
| | |
x | | changeset: 3:a8df460dbbfe
|/ / user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten using fold as 8:d15d0ffc75f6
+ | | obsolete: rewritten as d15d0ffc75f6
| | summary: C
| |
x | changeset: 2:c473644ee0e9
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten using fold as 7:b868bc49b0a4
+ | | obsolete: rewritten as b868bc49b0a4
| | summary: B
| |
x | changeset: 1:2a34000d3544
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using fold as 7:b868bc49b0a4
+ | obsolete: rewritten as b868bc49b0a4
| summary: A
|
o changeset: 0:ea207398892e
@@ -247,27 +248,27 @@
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: orphan
+ | trouble: unstable
| summary: fold2
|
o changeset: 14:ec31316faa9d
| parent: 4:868d2e0eb19c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: orphan
+ | trouble: unstable
| summary: fold2
|
| o changeset: 13:d0f33db50670
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan
+ | | trouble: unstable
| | summary: fold1
| |
| o changeset: 12:7b3290f6e0a0
| | parent: 2:c473644ee0e9
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan
+ | | trouble: unstable
| | summary: fold1
| |
| | o changeset: 11:e036916b63ea
@@ -284,25 +285,25 @@
x | | changeset: 4:868d2e0eb19c
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: split using fold, split as 12:7b3290f6e0a0, 13:d0f33db50670
+ | | | obsolete: split as 7b3290f6e0a0, d0f33db50670
| | | summary: D
| | |
x | | changeset: 3:a8df460dbbfe
|/ / user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: split using fold, split as 12:7b3290f6e0a0, 13:d0f33db50670
+ | | obsolete: split as 7b3290f6e0a0, d0f33db50670
| | summary: C
| |
x | changeset: 2:c473644ee0e9
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: split using fold, split as 10:19e14c8397fc, 11:e036916b63ea
+ | | obsolete: split as 19e14c8397fc, e036916b63ea
| | summary: B
| |
x | changeset: 1:2a34000d3544
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split using fold, split as 10:19e14c8397fc, 11:e036916b63ea
+ | obsolete: split as 19e14c8397fc, e036916b63ea
| summary: A
|
o changeset: 0:ea207398892e
@@ -317,27 +318,28 @@
$ hg prune -s 12 -r 11
1 changesets pruned
$ hg prune -s 14 -r 13 -n "this is a note stored in obsmarker in prune"
+ current hg version does not support storing note in obsmarker
1 changesets pruned
$ hg log -G
@ changeset: 15:d4a000f63ee9
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: orphan
+ | trouble: unstable
| summary: fold2
|
o changeset: 14:ec31316faa9d
| parent: 4:868d2e0eb19c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: orphan
+ | trouble: unstable
| summary: fold2
|
| o changeset: 12:7b3290f6e0a0
| | parent: 2:c473644ee0e9
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan
+ | | trouble: unstable
| | summary: fold1
| |
| | o changeset: 10:19e14c8397fc
@@ -349,25 +351,25 @@
x | | changeset: 4:868d2e0eb19c
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: split using fold, prune, split as 12:7b3290f6e0a0, 14:ec31316faa9d
+ | | | obsolete: split as 7b3290f6e0a0, ec31316faa9d
| | | summary: D
| | |
x | | changeset: 3:a8df460dbbfe
|/ / user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: split using fold, prune, split as 12:7b3290f6e0a0, 14:ec31316faa9d
+ | | obsolete: split as 7b3290f6e0a0, ec31316faa9d
| | summary: C
| |
x | changeset: 2:c473644ee0e9
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: split using fold, prune, split as 10:19e14c8397fc, 12:7b3290f6e0a0
+ | | obsolete: split as 19e14c8397fc, 7b3290f6e0a0
| | summary: B
| |
x | changeset: 1:2a34000d3544
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split using fold, prune, split as 10:19e14c8397fc, 12:7b3290f6e0a0
+ | obsolete: split as 19e14c8397fc, 7b3290f6e0a0
| summary: A
|
o changeset: 0:ea207398892e
@@ -385,25 +387,25 @@
o 7b3290f6e0a0 (12) fold1
|\
x | d15d0ffc75f6 (8) fold1
- |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
| | |
| | x e036916b63ea (11) fold0
- | | | rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
| | |
x | | 868d2e0eb19c (4) D
- / / rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / / rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | a8df460dbbfe (3) C
- / rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x b868bc49b0a4 (7) fold0
- |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
| |
x | 2a34000d3544 (1) A
- / rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x c473644ee0e9 (2) B
- rewritten(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
While with all option, we should see 15 changesets
@@ -417,38 +419,38 @@
| | | | o ec31316faa9d (14) fold2
| | | |/|
| | | x | 100cc25b765f (9) fold2
- | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | |\ \ rewritten(parent, content) as d4a000f63ee9, ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | |
| +-------x d0f33db50670 (13) fold1
- | | | | | rewritten(description, parent, content) as ec31316faa9d using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | | | rewritten(description, parent, content) as ec31316faa9d by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | | note: this is a note stored in obsmarker in prune
| | | | |
+---x | | e036916b63ea (11) fold0
- | | / / rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | / / rewritten(description, parent, content) as 7b3290f6e0a0 by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
| | x | 0da815c333f6 (5) E
- | | / rewritten(description, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | / rewritten(description, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
| | | note: folding changesets to test
| | |
x | | b868bc49b0a4 (7) fold0
- |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ |\ \ \ rewritten(parent, content) as 19e14c8397fc, e036916b63ea by test (Thu Jan 01 00:00:00 1970 +0000)
| | | |
| | x | d15d0ffc75f6 (8) fold1
- | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | |\ \ rewritten(parent, content) as 7b3290f6e0a0, d0f33db50670 by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | |
| | | | x d9f908fde1a1 (6) F
- | | | | rewritten(description, parent, content) as 100cc25b765f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ | | | | rewritten(description, parent, content) as 100cc25b765f by test (Thu Jan 01 00:00:00 1970 +0000)
| | | | note: folding changesets to test
| | | |
x | | | 2a34000d3544 (1) A
- / / / rewritten(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / / / rewritten(description, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
| | |
| x | 868d2e0eb19c (4) D
- | / rewritten(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ | / rewritten(description, parent, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| x a8df460dbbfe (3) C
- | rewritten(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description, content) as d15d0ffc75f6 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x c473644ee0e9 (2) B
- rewritten(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as b868bc49b0a4 by test (Thu Jan 01 00:00:00 1970 +0000)
--- a/tests/test-evolve-obshistory-content-divergent.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-obshistory-content-divergent.t Thu Oct 25 16:33:10 2018 +0200
@@ -28,7 +28,7 @@
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 2:fdf9bde5129a
+ | obsolete: reworded as fdf9bde5129a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -41,28 +41,28 @@
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: fdf9bde5129a)
$ hg amend -m "A2"
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg log --hidden -G
@ changeset: 3:65b757b745b9
| tag: tip
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: A2
|
| o changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: A1
|
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 2:fdf9bde5129a
- | obsolete: reworded using amend as 3:65b757b745b9
+ | obsolete: reworded as fdf9bde5129a
+ | obsolete: reworded as 65b757b745b9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -76,7 +76,7 @@
Check that debugobshistory on the divergent revision show both destinations
$ hg obslog --hidden 471f378eab4c --patch
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -84,7 +84,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -101,7 +101,7 @@
| o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -109,7 +109,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -130,7 +130,6 @@
"effect": [
"description"
],
- "operation": "amend",
"succnodes": [
"65b757b745b9"
],
@@ -145,7 +144,6 @@
"effect": [
"description"
],
- "operation": "amend",
"succnodes": [
"fdf9bde5129a"
],
@@ -164,7 +162,7 @@
o fdf9bde5129a (2) A1
|
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -172,7 +170,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -189,7 +187,7 @@
| o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -197,7 +195,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -212,7 +210,7 @@
@ 65b757b745b9 (3) A2
|
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -220,7 +218,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -236,7 +234,7 @@
| o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -244,7 +242,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -261,7 +259,7 @@
| o fdf9bde5129a (2) A1
|/
x 471f378eab4c (1) A0
- rewritten(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 65b757b745b9 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r 65b757b745b9 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -269,7 +267,7 @@
-A0
+A2
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -296,7 +294,6 @@
"effect": [
"description"
],
- "operation": "amend",
"succnodes": [
"65b757b745b9"
],
@@ -311,7 +308,6 @@
"effect": [
"description"
],
- "operation": "amend",
"succnodes": [
"fdf9bde5129a"
],
--- a/tests/test-evolve-obshistory-fold.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-obshistory-fold.t Thu Oct 25 16:33:10 2018 +0200
@@ -50,13 +50,13 @@
| x changeset: 2:0dec01379d3b
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten using fold as 3:eb5a0daa2192
+ | | obsolete: rewritten as eb5a0daa2192
| | summary: B0
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using fold as 3:eb5a0daa2192
+ | obsolete: rewritten as eb5a0daa2192
| summary: A0
|
o changeset: 0:ea207398892e
@@ -73,7 +73,7 @@
the revision with the target
$ hg obslog --hidden 471f378eab4c --patch
x 471f378eab4c (1) A0
- rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -93,11 +93,11 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
- / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
- rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -116,7 +116,7 @@
the revision with the target
$ hg obslog --hidden 0dec01379d3b --patch
x 0dec01379d3b (2) B0
- rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, changesets rebased)
Check that with all option, all changesets are shown
@@ -124,11 +124,11 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
- / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
- rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -149,11 +149,11 @@
@ eb5a0daa2192 (3) C0
|\
x | 0dec01379d3b (2) B0
- / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, changesets rebased)
|
x 471f378eab4c (1) A0
- rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -184,10 +184,9 @@
0 (glob)
],
"effect": [
- "description",
+ *, (glob)
"content"
],
- "operation": "fold",
"succnodes": [
"eb5a0daa2192"
],
@@ -203,7 +202,7 @@
"markers": [
{
"date": [
- *, (glob)
+ 0.0,
0 (glob)
],
"effect": [
@@ -211,7 +210,6 @@
"parent",
"content"
],
- "operation": "fold",
"succnodes": [
"eb5a0daa2192"
],
@@ -248,11 +246,11 @@
o eb5a0daa2192 (2) C0
|\
x | 0dec01379d3b
- / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, context is not local)
|
x 471f378eab4c (1) A0
- rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -271,31 +269,17 @@
o eb5a0daa2192 (2) C0
|
x 471f378eab4c (1) A0
- rewritten(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
- diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
- --- a/changeset-description
- +++ b/changeset-description
- @@ -1,1 +1,1 @@
- -A0
- +C0
-
- diff -r 471f378eab4c -r eb5a0daa2192 B0
- --- /dev/null Thu Jan 01 00:00:00 1970 +0000
- +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
- @@ -0,0 +1,1 @@
- +B0
-
$ hg obslog -R $TESTTMP/server --all --patch 471f378eab4c --hidden
o eb5a0daa2192 (2) C0
|\
x | 0dec01379d3b
- / rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, parent, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, context is not local)
|
x 471f378eab4c (1) A0
- rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as eb5a0daa2192 by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -314,18 +298,4 @@
o eb5a0daa2192 (2) C0
|
x 471f378eab4c (1) A0
- rewritten(description, content) as eb5a0daa2192 using fold by test (at Thu Jan 01 00:00:00 1970 +0000)
- diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
- --- a/changeset-description
- +++ b/changeset-description
- @@ -1,1 +1,1 @@
- -A0
- +C0
- diff -r 471f378eab4c -r eb5a0daa2192 B0
- --- /dev/null Thu Jan 01 00:00:00 1970 +0000
- +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
- @@ -0,0 +1,1 @@
- +B0
-
-
--- a/tests/test-evolve-obshistory-lots-of-splits.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-obshistory-lots-of-splits.t Thu Oct 25 16:33:10 2018 +0200
@@ -149,7 +149,7 @@
| x changeset: 1:de7290d8b885
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a, 4:1ae8bc733a14, 5:c7f044602e9b
+ | obsolete: split as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -162,7 +162,7 @@
$ hg obslog de7290d8b885 --hidden --patch
x de7290d8b885 (1) A0
- rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, too many successors (4))
$ hg obslog de7290d8b885 --hidden --all --patch
@@ -175,7 +175,7 @@
| o f257fde29c7a (3) A0
|/
x de7290d8b885 (1) A0
- rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, too many successors (4))
$ hg obslog de7290d8b885 --hidden --no-graph -Tjson | python -m json.tool
@@ -191,7 +191,6 @@
"parent",
"content"
],
- "operation": "split",
"succnodes": [
"1ae8bc733a14",
"337fec4d2edc",
@@ -211,7 +210,7 @@
@ c7f044602e9b (5) A0
|
x de7290d8b885 (1) A0
- rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, too many successors (4))
$ hg obslog c7f044602e9b --no-graph -Tjson | python -m json.tool
@@ -233,7 +232,6 @@
"parent",
"content"
],
- "operation": "split",
"succnodes": [
"1ae8bc733a14",
"337fec4d2edc",
@@ -260,7 +258,7 @@
| o f257fde29c7a (3) A0
|/
x de7290d8b885 (1) A0
- rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, too many successors (4))
$ hg obslog 5 --all --patch
@@ -273,7 +271,7 @@
| o f257fde29c7a (3) A0
|/
x de7290d8b885 (1) A0
- rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 1ae8bc733a14, 337fec4d2edc, c7f044602e9b, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, too many successors (4))
$ hg update de7290d8b885
--- a/tests/test-evolve-obshistory-phase-divergent.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-obshistory-phase-divergent.t Thu Oct 25 16:33:10 2018 +0200
@@ -28,7 +28,7 @@
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 2:fdf9bde5129a
+ | obsolete: reworded as fdf9bde5129a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -41,14 +41,14 @@
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: fdf9bde5129a)
$ hg phase -p .
- 1 new phase-divergent changesets
+ 1 new bumped changesets
$ hg log --hidden -G
o changeset: 2:fdf9bde5129a
| tag: tip
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: phase-divergent
+ | trouble: bumped
| summary: A1
|
| @ changeset: 1:471f378eab4c
@@ -67,7 +67,7 @@
Check that debugobshistory on the divergent revision show both destinations
$ hg obslog --hidden 471f378eab4c --patch
@ 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -82,7 +82,7 @@
o fdf9bde5129a (2) A1
|
@ 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -103,7 +103,6 @@
"effect": [
"description"
],
- "operation": "amend",
"succnodes": [
"fdf9bde5129a"
],
@@ -122,7 +121,7 @@
o fdf9bde5129a (2) A1
|
@ 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -137,7 +136,7 @@
o fdf9bde5129a (2) A1
|
@ 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -152,7 +151,7 @@
o fdf9bde5129a (2) A1
|
@ 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -166,7 +165,7 @@
o fdf9bde5129a (2) A1
|
@ 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -181,7 +180,7 @@
o fdf9bde5129a (2) A1
|
@ 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -208,7 +207,6 @@
"effect": [
"description"
],
- "operation": "amend",
"succnodes": [
"fdf9bde5129a"
],
--- a/tests/test-evolve-obshistory-prune.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-obshistory-prune.t Thu Oct 25 16:33:10 2018 +0200
@@ -46,7 +46,7 @@
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: pruned using prune
+ | obsolete: pruned
| summary: B0
|
@ changeset: 1:471f378eab4c
@@ -65,7 +65,7 @@
$ hg obslog 'desc(B0)' --hidden --patch
x 0dec01379d3b (2) B0
- pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
+ pruned by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, no successors)
$ hg obslog 'desc(B0)' --hidden --no-graph -Tjson | python -m json.tool
@@ -77,7 +77,6 @@
*, (glob)
0 (glob)
],
- "operation": "prune",
"user": "test",
"verb": "pruned"
}
@@ -115,7 +114,7 @@
$ hg obslog -f -R $TESTTMP/server --patch 0dec01379d3b --hidden
x 0dec01379d3b (2) B0
- pruned using prune by test (at Thu Jan 01 00:00:00 1970 +0000)
+ pruned by test (at Thu Jan 01 00:00:00 1970 +0000)
(No patch available, no successors)
# TODO ADD amend + prune
--- a/tests/test-evolve-obshistory-split.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-obshistory-split.t Thu Oct 25 16:33:10 2018 +0200
@@ -42,6 +42,7 @@
> y
> y
> EOF
+ current hg version does not support storing note in obsmarker
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
adding a
adding b
@@ -87,7 +88,7 @@
| x changeset: 1:471597cad322
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a
+ | obsolete: split as 337fec4d2edc, f257fde29c7a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -101,7 +102,7 @@
Check that debugobshistory on splitted commit show both targets
$ hg obslog 471597cad322 --hidden --patch
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -119,7 +120,6 @@
"content"
],
"note": "testing split",
- "operation": "split",
"succnodes": [
"337fec4d2edc",
"f257fde29c7a"
@@ -139,7 +139,7 @@
o 337fec4d2edc (2) A0
|
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -150,7 +150,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -160,7 +160,7 @@
@ f257fde29c7a (3) A0
|
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -171,7 +171,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -182,7 +182,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -194,7 +194,7 @@
| @ f257fde29c7a (3) A0
|/
x 471597cad322 (1) A0
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, too many successors (2))
@@ -214,7 +214,7 @@
o f257fde29c7a (2) A0
|
x 471597cad322
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, context is not local)
@@ -227,7 +227,7 @@
| o f257fde29c7a (2) A0
|/
x 471597cad322
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, context is not local)
@@ -239,13 +239,13 @@
$ hg obslog -R $TESTTMP/server --no-graph -f --all --patch tip
f257fde29c7a (2) A0
471597cad322
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, context is not local)
$ hg obslog -R $TESTTMP/server --no-graph -f --all --patch tip
f257fde29c7a (2) A0
471597cad322
- rewritten(parent, content) as 337fec4d2edc, f257fde29c7a using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(parent, content) as 337fec4d2edc, f257fde29c7a by test (Thu Jan 01 00:00:00 1970 +0000)
note: testing split
(No patch available, context is not local)
--- a/tests/test-evolve-obshistory.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-obshistory.t Thu Oct 25 16:33:10 2018 +0200
@@ -76,13 +76,13 @@
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 3:7a230b46bf61
+ | obsolete: reworded as 7a230b46bf61
| summary: A1
|
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 2:fdf9bde5129a
+ | obsolete: reworded as fdf9bde5129a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -97,7 +97,7 @@
@ 7a230b46bf61 (3) A2
|
x fdf9bde5129a (2) A1
- | rewritten(description) as 7a230b46bf61 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000)
| diff -r fdf9bde5129a -r 7a230b46bf61 changeset-description
| --- a/changeset-description
| +++ b/changeset-description
@@ -107,7 +107,7 @@
|
|
x 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
diff -r 471f378eab4c -r fdf9bde5129a changeset-description
--- a/changeset-description
+++ b/changeset-description
@@ -126,7 +126,6 @@
added 1 changesets with 0 changes to 1 files (+1 heads)
2 new obsolescence markers
obsoleted 1 changesets
- new changesets 7a230b46bf61
(run 'hg heads' to see heads, 'hg merge' to merge)
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: 7a230b46bf61)
@@ -136,11 +135,11 @@
o 7a230b46bf61 (2) A2
|
x fdf9bde5129a
- | rewritten(description) as 7a230b46bf61 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(description) as 7a230b46bf61 by test (Thu Jan 01 00:00:00 1970 +0000)
| (No patch available, context is not local)
|
@ 471f378eab4c (1) A0
- rewritten(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as fdf9bde5129a by test (Thu Jan 01 00:00:00 1970 +0000)
(No patch available, successor is unknown locally)
@@ -148,23 +147,15 @@
o 7a230b46bf61 (2) A2
|
@ 471f378eab4c (1) A0
- reworded(description) as 7a230b46bf61 using amend by test (at Thu Jan 01 00:00:00 1970 +0000)
- diff -r 471f378eab4c -r 7a230b46bf61 changeset-description
- --- a/changeset-description
- +++ b/changeset-description
- @@ -1,1 +1,1 @@
- -A0
- +A2
-
$ hg obslog 7a230b46bf61 --color=debug --patch
o [evolve.node|7a230b46bf61] [evolve.rev|(2)] [evolve.short_description|A2]
|
x [evolve.node evolve.missing_change_ctx|fdf9bde5129a]
- | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+ | [evolve.verb|rewritten](description) as [evolve.node|7a230b46bf61] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
| (No patch available, context is not local)
|
@ [evolve.node|471f378eab4c] [evolve.rev|(1)] [evolve.short_description|A0]
- [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] using [evolve.operation|amend] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
+ [evolve.verb|rewritten](description) as [evolve.node|fdf9bde5129a] by [evolve.user|test] [evolve.date|(Thu Jan 01 00:00:00 1970 +0000)]
(No patch available, successor is unknown locally)
--- a/tests/test-evolve-order.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-order.t Thu Oct 25 16:33:10 2018 +0200
@@ -44,9 +44,9 @@
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo "aaa" > _a
$ hg amend
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg log -G
- @ 4:12d519679175@default(draft) add _a
+ @ 5:12d519679175@default(draft) add _a
|
| o 3:4d156641b718@default(draft) add _c
| |
@@ -60,7 +60,7 @@
evolve --rev reorders the rev to solve instability, trivial case 2 revs wrong order
$ hg evolve --rev 'desc(_c) + desc(_b)'
move:[2] add _b
- atop:[4] add _a
+ atop:[5] add _a
move:[3] add _c
working directory is now at 52b8f9b04f83
@@ -72,10 +72,10 @@
$ hg up "desc(_a)"
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ hg amend -m "aprime"
- 3 new orphan changesets
+ 3 new unstable changesets
$ hg evolve --rev "desc(_b)"
- move:[5] add _b
- atop:[8] aprime
+ move:[6] add _b
+ atop:[9] aprime
working directory is now at 476c9c052aae
$ hg up "desc(_b) - obsolete()"
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -83,38 +83,38 @@
$ hg up "desc(aprime)"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg amend -m "asecond"
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg log -G
- @ 11:9a584314f3f3@default(draft) asecond
+ @ 12:9a584314f3f3@default(draft) asecond
|
- | o 10:a59c79776f7c@default(draft) bprime
+ | o 11:a59c79776f7c@default(draft) bprime
| |
- | x 8:81a687b96d4d@default(draft) aprime
+ | x 9:81a687b96d4d@default(draft) aprime
|/
- | o 7:464731bc0ed0@default(draft) add _d
+ | o 8:464731bc0ed0@default(draft) add _d
| |
- | o 6:52b8f9b04f83@default(draft) add _c
+ | o 7:52b8f9b04f83@default(draft) add _c
| |
- | x 5:59476c3836ef@default(draft) add _b
+ | x 6:59476c3836ef@default(draft) add _b
| |
- | x 4:12d519679175@default(draft) add _a
+ | x 5:12d519679175@default(draft) add _a
|/
o 0:f92638be10c7@default(public) add p
$ hg evolve --rev "orphan()"
- move:[10] bprime
- atop:[11] asecond
- move:[6] add _c
- move:[7] add _d
+ move:[11] bprime
+ atop:[12] asecond
+ move:[7] add _c
+ move:[8] add _d
working directory is now at 739f18ac1d03
$ hg log -G
- @ 14:739f18ac1d03@default(draft) add _d
+ @ 15:739f18ac1d03@default(draft) add _d
|
- o 13:e5960578d158@default(draft) add _c
+ o 14:e5960578d158@default(draft) add _c
|
- o 12:4ad33fa88946@default(draft) bprime
+ o 13:4ad33fa88946@default(draft) bprime
|
- o 11:9a584314f3f3@default(draft) asecond
+ o 12:9a584314f3f3@default(draft) asecond
|
o 0:f92638be10c7@default(public) add p
@@ -128,28 +128,28 @@
$ mkstack "desc(_d)" c1second >/dev/null
$ hg prune "desc(c1_)" -s "desc(c1prime)"
1 changesets pruned
- 3 new orphan changesets
+ 3 new unstable changesets
$ hg prune "desc(c2_)" -s "desc(c2prime)"
1 changesets pruned
$ hg prune "desc(c1prime)" -s "desc(c1second)"
1 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg log -G -r "desc(_d)::"
- @ 21:dcf786e878fd@default(draft) add c1second
+ @ 22:dcf786e878fd@default(draft) add c1second
|
- | o 20:507d52d715f6@default(draft) add c2prime
+ | o 21:507d52d715f6@default(draft) add c2prime
| |
- | x 19:c995cb124ddc@default(draft) add c1prime
+ | x 20:c995cb124ddc@default(draft) add c1prime
|/
- | o 18:d096a2437fd0@default(draft) add c4_
+ | o 19:d096a2437fd0@default(draft) add c4_
| |
- | o 17:cde95c6cba7a@default(draft) add c3_
+ | o 18:cde95c6cba7a@default(draft) add c3_
| |
- | x 16:e0d9f7a099fe@default(draft) add c2_
+ | x 17:e0d9f7a099fe@default(draft) add c2_
| |
- | x 15:43b7c338b1f8@default(draft) add c1_
+ | x 16:43b7c338b1f8@default(draft) add c1_
|/
- o 14:739f18ac1d03@default(draft) add _d
+ o 15:739f18ac1d03@default(draft) add _d
|
~
@@ -158,40 +158,40 @@
$ mkstack "desc(_d)" b1prime b3prime >/dev/null
$ hg prune "desc(b1_)" -s "desc(b1prime)"
1 changesets pruned
- 3 new orphan changesets
+ 3 new unstable changesets
$ hg prune "desc(b3_)" -s "desc(b3prime)"
1 changesets pruned
$ hg prune "desc(b2_)"
1 changesets pruned
$ hg log -G -r "desc(_d)::"
- @ 27:b253ff5b65d1@default(draft) add b3prime
+ @ 28:b253ff5b65d1@default(draft) add b3prime
|
- o 26:4acf61f11dfb@default(draft) add b1prime
+ o 27:4acf61f11dfb@default(draft) add b1prime
|
- | o 25:594e1fbbd61f@default(draft) add b4_
+ | o 26:594e1fbbd61f@default(draft) add b4_
| |
- | x 24:be27500cfc76@default(draft) add b3_
+ | x 25:be27500cfc76@default(draft) add b3_
| |
- | x 23:b54f77dc5831@default(draft) add b2_
+ | x 24:b54f77dc5831@default(draft) add b2_
| |
- | x 22:0e1eba27e9aa@default(draft) add b1_
+ | x 23:0e1eba27e9aa@default(draft) add b1_
|/
- | o 21:dcf786e878fd@default(draft) add c1second
+ | o 22:dcf786e878fd@default(draft) add c1second
|/
- | o 20:507d52d715f6@default(draft) add c2prime
+ | o 21:507d52d715f6@default(draft) add c2prime
| |
- | x 19:c995cb124ddc@default(draft) add c1prime
+ | x 20:c995cb124ddc@default(draft) add c1prime
|/
- | o 18:d096a2437fd0@default(draft) add c4_
+ | o 19:d096a2437fd0@default(draft) add c4_
| |
- | o 17:cde95c6cba7a@default(draft) add c3_
+ | o 18:cde95c6cba7a@default(draft) add c3_
| |
- | x 16:e0d9f7a099fe@default(draft) add c2_
+ | x 17:e0d9f7a099fe@default(draft) add c2_
| |
- | x 15:43b7c338b1f8@default(draft) add c1_
+ | x 16:43b7c338b1f8@default(draft) add c1_
|/
- o 14:739f18ac1d03@default(draft) add _d
+ o 15:739f18ac1d03@default(draft) add _d
|
~
@@ -200,34 +200,34 @@
(desc(_d)::) - desc(c3_)
$ hg evolve --rev "(desc(_d)::) - desc(c3_)"
cannot solve instability of d096a2437fd0, skipping
- move:[20] add c2prime
- atop:[21] add c1second
- move:[25] add b4_
- atop:[27] add b3prime
+ move:[21] add c2prime
+ atop:[22] add c1second
+ move:[26] add b4_
+ atop:[28] add b3prime
working directory is now at ea93190a9cd1
Cleanup
$ hg evolve --rev "(desc(_d)::)"
- move:[17] add c3_
- atop:[28] add c2prime
- move:[18] add c4_
+ move:[18] add c3_
+ atop:[29] add c2prime
+ move:[19] add c4_
working directory is now at 35e7b797ace5
$ hg log -G -r "desc(_d)::"
- @ 31:35e7b797ace5@default(draft) add c4_
+ @ 32:35e7b797ace5@default(draft) add c4_
|
- o 30:0b9488394e89@default(draft) add c3_
+ o 31:0b9488394e89@default(draft) add c3_
|
- | o 29:ea93190a9cd1@default(draft) add b4_
+ | o 30:ea93190a9cd1@default(draft) add b4_
| |
- o | 28:881b9c092e53@default(draft) add c2prime
+ o | 29:881b9c092e53@default(draft) add c2prime
| |
- | o 27:b253ff5b65d1@default(draft) add b3prime
+ | o 28:b253ff5b65d1@default(draft) add b3prime
| |
- | o 26:4acf61f11dfb@default(draft) add b1prime
+ | o 27:4acf61f11dfb@default(draft) add b1prime
| |
- o | 21:dcf786e878fd@default(draft) add c1second
+ o | 22:dcf786e878fd@default(draft) add c1second
|/
- o 14:739f18ac1d03@default(draft) add _d
+ o 15:739f18ac1d03@default(draft) add _d
|
~
@@ -240,22 +240,22 @@
created new head
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- [28] add c2prime
+ [29] add c2prime
$ mkcommit c3part2
created new head
$ hg prune -s 'desc(c3part1)' 'desc(c3_)'
1 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg prune -s 'desc(c3part2)' 'desc(c3_)'
1 changesets pruned
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg up 'desc(b3prime)'
2 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ hg amend -m 'b3second'
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg evolve --rev "orphan()"
- move:[29] add b4_
- atop:[34] b3second
+ move:[30] add b4_
+ atop:[35] b3second
skipping 0b9488394e89: divergent rewriting. can't choose destination
working directory is now at 31809a198477
--- a/tests/test-evolve-orphan-merge.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-orphan-merge.t Thu Oct 25 16:33:10 2018 +0200
@@ -51,10 +51,10 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo bar > b
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg glog
- @ 4:64370c9805e7 added b
+ @ 5:64370c9805e7 added b
| () draft
| o 3:3b2b6f4652ee merging a and b
| |\ () draft
@@ -67,13 +67,13 @@
$ hg evolve --all
move:[3] merging a and b
- atop:[4] added b
+ atop:[5] added b
working directory is now at 91fd62122a4b
$ hg glog
- @ 5:91fd62122a4b merging a and b
+ @ 6:91fd62122a4b merging a and b
|\ () draft
- | o 4:64370c9805e7 added b
+ | o 5:64370c9805e7 added b
| | () draft
o | 1:c7586e2a9264 added a
|/ () draft
@@ -81,9 +81,9 @@
() draft
$ hg parents
- changeset: 5:91fd62122a4b
+ changeset: 6:91fd62122a4b
tag: tip
- parent: 4:64370c9805e7
+ parent: 5:64370c9805e7
parent: 1:c7586e2a9264
user: test
date: Thu Jan 01 00:00:00 1970 +0000
@@ -96,14 +96,14 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo bar > a
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg glog
- @ 6:3d41537b44ca added a
+ @ 8:3d41537b44ca added a
| () draft
- | o 5:91fd62122a4b merging a and b
+ | o 6:91fd62122a4b merging a and b
| |\ () draft
- +---o 4:64370c9805e7 added b
+ +---o 5:64370c9805e7 added b
| | () draft
| x 1:c7586e2a9264 added a
|/ () draft
@@ -111,25 +111,25 @@
() draft
$ hg evolve --all
- move:[5] merging a and b
- atop:[6] added a
+ move:[6] merging a and b
+ atop:[8] added a
working directory is now at 968d205ba4d8
$ hg glog
- @ 7:968d205ba4d8 merging a and b
+ @ 9:968d205ba4d8 merging a and b
|\ () draft
- | o 6:3d41537b44ca added a
+ | o 8:3d41537b44ca added a
| | () draft
- o | 4:64370c9805e7 added b
+ o | 5:64370c9805e7 added b
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
$ hg parents
- changeset: 7:968d205ba4d8
+ changeset: 9:968d205ba4d8
tag: tip
- parent: 6:3d41537b44ca
- parent: 4:64370c9805e7
+ parent: 8:3d41537b44ca
+ parent: 5:64370c9805e7
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: merging a and b
@@ -148,15 +148,15 @@
$ hg ci -Aqm "bar to c"
$ hg glog
- @ 9:d0f84b25d4e3 bar to c
+ @ 11:d0f84b25d4e3 bar to c
| () draft
- | o 8:1c165c673853 foo to c
+ | o 10:1c165c673853 foo to c
|/ () draft
- | o 7:968d205ba4d8 merging a and b
+ | o 9:968d205ba4d8 merging a and b
| |\ () draft
- +---o 6:3d41537b44ca added a
+ +---o 8:3d41537b44ca added a
| | () draft
- | o 4:64370c9805e7 added b
+ | o 5:64370c9805e7 added b
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -166,9 +166,9 @@
3 changesets pruned
$ hg glog
- @ 9:d0f84b25d4e3 bar to c
+ @ 11:d0f84b25d4e3 bar to c
| () draft
- | o 8:1c165c673853 foo to c
+ | o 10:1c165c673853 foo to c
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -185,11 +185,11 @@
$ hg ci -m "foobar to c"
$ hg glog
- @ 10:fd41d25a3e90 foobar to c
+ @ 12:fd41d25a3e90 foobar to c
|\ () draft
- | o 9:d0f84b25d4e3 bar to c
+ | o 11:d0f84b25d4e3 bar to c
| | () draft
- o | 8:1c165c673853 foo to c
+ o | 10:1c165c673853 foo to c
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -200,23 +200,23 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo FOO > c
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg glog
- @ 11:31c317b7bdb1 foo to c
+ @ 14:31c317b7bdb1 foo to c
| () draft
- | o 10:fd41d25a3e90 foobar to c
+ | o 12:fd41d25a3e90 foobar to c
| |\ () draft
- +---o 9:d0f84b25d4e3 bar to c
+ +---o 11:d0f84b25d4e3 bar to c
| | () draft
- | x 8:1c165c673853 foo to c
+ | x 10:1c165c673853 foo to c
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
$ hg evolve --all
- move:[10] foobar to c
- atop:[11] foo to c
+ move:[12] foobar to c
+ atop:[14] foo to c
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -227,24 +227,24 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- evolving 10:fd41d25a3e90 "foobar to c"
+ evolving 12:fd41d25a3e90 "foobar to c"
working directory is now at c5405d2da7a1
$ hg glog
- @ 12:c5405d2da7a1 foobar to c
+ @ 15:c5405d2da7a1 foobar to c
|\ () draft
- | o 11:31c317b7bdb1 foo to c
+ | o 14:31c317b7bdb1 foo to c
| | () draft
- o | 9:d0f84b25d4e3 bar to c
+ o | 11:d0f84b25d4e3 bar to c
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
$ hg parents
- changeset: 12:c5405d2da7a1
+ changeset: 15:c5405d2da7a1
tag: tip
- parent: 9:d0f84b25d4e3
- parent: 11:31c317b7bdb1
+ parent: 11:d0f84b25d4e3
+ parent: 14:31c317b7bdb1
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: foobar to c
@@ -255,23 +255,23 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo foo > c
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg glog
- @ 13:928097d0b5b5 foo to c
+ @ 17:928097d0b5b5 foo to c
| () draft
- | o 12:c5405d2da7a1 foobar to c
+ | o 15:c5405d2da7a1 foobar to c
| |\ () draft
- +---x 11:31c317b7bdb1 foo to c
+ +---x 14:31c317b7bdb1 foo to c
| | () draft
- | o 9:d0f84b25d4e3 bar to c
+ | o 11:d0f84b25d4e3 bar to c
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
$ hg evolve --all
- move:[12] foobar to c
- atop:[13] foo to c
+ move:[15] foobar to c
+ atop:[17] foo to c
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -283,15 +283,15 @@
continue: hg evolve --continue
$ hg evolve --continue
- evolving 12:c5405d2da7a1 "foobar to c"
+ evolving 15:c5405d2da7a1 "foobar to c"
working directory is now at dc1948a6eeab
$ hg glog
- @ 14:dc1948a6eeab foobar to c
+ @ 18:dc1948a6eeab foobar to c
|\ () draft
- | o 13:928097d0b5b5 foo to c
+ | o 17:928097d0b5b5 foo to c
| | () draft
- o | 9:d0f84b25d4e3 bar to c
+ o | 11:d0f84b25d4e3 bar to c
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -309,13 +309,13 @@
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ for ch in x y; do echo foo > $ch; hg ci -Aqm "added "$ch; done;
$ hg glog
- @ 18:863d11043c67 added y
+ @ 22:863d11043c67 added y
| () draft
- o 17:3f2247835c1d added x
+ o 21:3f2247835c1d added x
| () draft
- | o 16:e44dc179e7f5 added m
+ | o 20:e44dc179e7f5 added m
| | () draft
- | o 15:8634bee7bf1e added l
+ | o 19:8634bee7bf1e added l
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -329,39 +329,39 @@
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ echo bar > l
$ hg amend
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg glog
- @ 20:fccc9de66799 added l
+ @ 25:fccc9de66799 added l
| () draft
- | o 19:190763373d8b merge commit
+ | o 23:190763373d8b merge commit
| |\ () draft
- | | o 18:863d11043c67 added y
+ | | o 22:863d11043c67 added y
| | | () draft
- +---o 17:3f2247835c1d added x
+ +---o 21:3f2247835c1d added x
| | () draft
- | o 16:e44dc179e7f5 added m
+ | o 20:e44dc179e7f5 added m
| | () draft
- | x 15:8634bee7bf1e added l
+ | x 19:8634bee7bf1e added l
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
$ hg evolve --all
- move:[16] added m
- atop:[20] added l
- move:[19] merge commit
+ move:[20] added m
+ atop:[25] added l
+ move:[23] merge commit
working directory is now at a446ad3e6700
$ hg glog
- @ 22:a446ad3e6700 merge commit
+ @ 27:a446ad3e6700 merge commit
|\ () draft
- | o 21:495d2039f8f1 added m
+ | o 26:495d2039f8f1 added m
| | () draft
- | o 20:fccc9de66799 added l
+ | o 25:fccc9de66799 added l
| | () draft
- o | 18:863d11043c67 added y
+ o | 22:863d11043c67 added y
| | () draft
- o | 17:3f2247835c1d added x
+ o | 21:3f2247835c1d added x
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -375,9 +375,9 @@
3 changesets pruned
$ hg glog
- @ 20:fccc9de66799 added l
+ @ 25:fccc9de66799 added l
| () draft
- | o 17:3f2247835c1d added x
+ | o 21:3f2247835c1d added x
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -391,39 +391,39 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo foobar > l
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg up 3f2247835c1d
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo bar > x
$ hg amend
$ hg glog
- @ 25:cdf6547da25f added x
+ @ 32:cdf6547da25f added x
| () draft
- | o 24:3f371171d767 added l
+ | o 30:3f371171d767 added l
|/ () draft
- | o 23:7b78a9784f3e merged l and x
+ | o 28:7b78a9784f3e merged l and x
| |\ () draft
- +---x 20:fccc9de66799 added l
+ +---x 25:fccc9de66799 added l
| | () draft
- | x 17:3f2247835c1d added x
+ | x 21:3f2247835c1d added x
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
XXX: We should handle this case too
$ hg evolve --all
- move:[23] merged l and x
- atop:[25] added x
- move:[26] merged l and x
- atop:[24] added l
+ move:[28] merged l and x
+ atop:[32] added x
+ move:[33] merged l and x
+ atop:[30] added l
working directory is now at adb665a78e08
$ hg glog
- @ 27:adb665a78e08 merged l and x
+ @ 34:adb665a78e08 merged l and x
|\ () draft
- | o 25:cdf6547da25f added x
+ | o 32:cdf6547da25f added x
| | () draft
- o | 24:3f371171d767 added l
+ o | 30:3f371171d767 added l
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -445,10 +445,10 @@
+bar
$ hg parents
- changeset: 27:adb665a78e08
+ changeset: 34:adb665a78e08
tag: tip
- parent: 24:3f371171d767
- parent: 25:cdf6547da25f
+ parent: 30:3f371171d767
+ parent: 32:cdf6547da25f
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: merged l and x
@@ -459,26 +459,26 @@
$ hg prune -r cdf6547da25f
1 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg glog
- @ 27:adb665a78e08 merged l and x
+ @ 34:adb665a78e08 merged l and x
|\ () draft
- | x 25:cdf6547da25f added x
+ | x 32:cdf6547da25f added x
| | () draft
- o | 24:3f371171d767 added l
+ o | 30:3f371171d767 added l
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
$ hg evolve --rev .
- move:[27] merged l and x
+ move:[34] merged l and x
atop:[0] added hgignore
working directory is now at fb8fe870ae7d
$ hg glog
- @ 28:fb8fe870ae7d merged l and x
+ @ 35:fb8fe870ae7d merged l and x
|\ () draft
- | o 24:3f371171d767 added l
+ | o 30:3f371171d767 added l
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -488,21 +488,21 @@
--------------------------------------------------------------------------------
$ hg glog
- @ 28:fb8fe870ae7d merged l and x
+ @ 35:fb8fe870ae7d merged l and x
|\ () draft
- | o 24:3f371171d767 added l
+ | o 30:3f371171d767 added l
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
$ hg prune -r 3f371171d767
1 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg glog
- @ 28:fb8fe870ae7d merged l and x
+ @ 35:fb8fe870ae7d merged l and x
|\ () draft
- | x 24:3f371171d767 added l
+ | x 30:3f371171d767 added l
|/ () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -528,12 +528,12 @@
point where the other parent of merge is the first non-pruned ancestor.
$ hg evolve -r .
- move:[28] merged l and x
+ move:[35] merged l and x
atop:[0] added hgignore
working directory is now at b61ba77b924a
$ hg glog
- @ 29:b61ba77b924a merged l and x
+ @ 36:b61ba77b924a merged l and x
| () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -558,21 +558,21 @@
(branch merge, don't forget to commit)
$ hg ci -m "merge commit"
$ hg glog
- @ 31:32beb84b9dbc merge commit
+ @ 38:32beb84b9dbc merge commit
|\ () draft
- | o 30:f3ba8b99bb6f added foo
+ | o 37:f3ba8b99bb6f added foo
| () draft
o 0:8fa14d15e168 added hgignore
() draft
$ hg prune -r f3ba8b99bb6f
1 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg glog
- @ 31:32beb84b9dbc merge commit
+ @ 38:32beb84b9dbc merge commit
|\ () draft
- | x 30:f3ba8b99bb6f added foo
+ | x 37:f3ba8b99bb6f added foo
| () draft
o 0:8fa14d15e168 added hgignore
() draft
@@ -590,12 +590,12 @@
just remove that chain.
$ hg evolve -r .
- move:[31] merge commit
+ move:[38] merge commit
atop:[-1]
working directory is now at d2a03dd8c951
$ hg glog
- @ 32:d2a03dd8c951 merge commit
+ @ 39:d2a03dd8c951 merge commit
| () draft
o 0:8fa14d15e168 added hgignore
() draft
--- a/tests/test-evolve-phase-divergence.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-phase-divergence.t Thu Oct 25 16:33:10 2018 +0200
@@ -80,7 +80,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 4d1169d82e47
(run 'hg update' to get a working copy)
$ hg glog
@@ -114,7 +113,7 @@
pulling from ../public
searching for changes
no changes found
- 1 new phase-divergent changesets
+ 1 new bumped changesets
$ hg glog
@ 2:98bb3a6cfe1a tweak a
@@ -129,7 +128,7 @@
$ hg evolve --list
98bb3a6cfe1a: tweak a
- phase-divergent: 4d1169d82e47 (immutable precursor)
+ bumped: 4d1169d82e47 (immutable precursor)
@@ -152,7 +151,7 @@
@ 98bb3a6cfe1a (2) tweak a
|
o 4d1169d82e47 (1) modify a
- rewritten(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description) as 98bb3a6cfe1a by test (Thu Jan 01 00:00:00 1970 +0000)
Solving the phase divergence using evolve command
--------------------------------------------------
@@ -184,7 +183,7 @@
hg rebase --rev 98bb3a6cfe1a --dest d3873e73d99e;
hg update 4d1169d82e47;
hg revert --all --rev 98bb3a6cfe1a;
- hg commit --msg "phase-divergent update to 98bb3a6cfe1a"
+ hg commit --msg "bumped update to 98bb3a6cfe1a"
XXX: evolve should have mentioned that draft commit is just obsoleted in favour
of public one. From the message it looks like a new commit is created.
@@ -259,7 +258,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets aa071e5554e3
(run 'hg update' to get a working copy)
$ hg push ../public
@@ -282,10 +280,10 @@
pulling from ../public
searching for changes
no changes found
- 1 new phase-divergent changesets
+ 1 new bumped changesets
$ hg glog
- @ 4:d47f2b37ed82 added bar to foo
+ @ 5:d47f2b37ed82 added bar to foo
| (bm) draft
| o 3:aa071e5554e3 added foo to foo
|/ () public
@@ -304,24 +302,24 @@
test I have to go through code base to understand what will be the behavior
$ hg evolve --phase-divergent
- recreate:[4] added bar to foo
+ recreate:[5] added bar to foo
atop:[3] added foo to foo
computing new diff
- committed as 3d62500c673d
- working directory is now at 3d62500c673d
+ committed as bdf645eb43bb
+ working directory is now at bdf645eb43bb
$ hg exp
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 3d62500c673dd1c88bb09a73e86d0210aed6fcb6
+ # Node ID bdf645eb43bb0c9f180cd17d109bb359ce1571b2
# Parent aa071e5554e36080a36cfd24accd5a71e3320f1e
- phase-divergent update to aa071e5554e3:
+ bumped update to aa071e5554e3:
added bar to foo
- diff -r aa071e5554e3 -r 3d62500c673d foo
+ diff -r aa071e5554e3 -r bdf645eb43bb foo
--- a/foo Thu Jan 01 00:00:00 1970 +0000
+++ b/foo Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,2 @@
@@ -332,7 +330,7 @@
the commit message
$ hg glog
- @ 5:3d62500c673d phase-divergent update to aa071e5554e3:
+ @ 6:bdf645eb43bb bumped update to aa071e5554e3:
| (bm) draft
o 3:aa071e5554e3 added foo to foo
| () public
@@ -342,13 +340,13 @@
() public
$ hg obslog -r . --all
- @ 3d62500c673d (5) phase-divergent update to aa071e5554e3:
+ @ bdf645eb43bb (6) bumped update to aa071e5554e3:
|
- x d47f2b37ed82 (4) added bar to foo
- | rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ x d47f2b37ed82 (5) added bar to foo
+ | rewritten(description, parent, content) as bdf645eb43bb by test (Thu Jan 01 00:00:00 1970 +0000)
|
o aa071e5554e3 (3) added foo to foo
- rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(description, content) as d47f2b37ed82 by test (Thu Jan 01 00:00:00 1970 +0000)
Syncing all other repositories
@@ -364,7 +362,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 2 new obsolescence markers
+ 3 new obsolescence markers
$ hg push ../private
pushing to ../private
@@ -373,7 +371,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 2 new obsolescence markers
+ 3 new obsolescence markers
$ hg push ../public
pushing to ../public
@@ -382,7 +380,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 2 new obsolescence markers
+ 3 new obsolescence markers
Creating a phasedivergence changeset where the divergent changeset changed in a
way that we rebase that on old public changeset, there will be conflicts, but
@@ -412,7 +410,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets b756eb10ea73
(run 'hg update' to get a working copy)
$ hg push ../public
@@ -433,14 +430,14 @@
pulling from ../public
searching for changes
no changes found
- 1 new phase-divergent changesets
+ 1 new bumped changesets
$ hg glog
- @ 7:2c3560aedead foo to bar
+ @ 9:d529f41744b3 foo to bar
| (bm) draft
- | o 6:b756eb10ea73 added bar to bar
+ | o 7:6176b60d16d2 added bar to bar
|/ () public
- o 5:3d62500c673d phase-divergent update to aa071e5554e3:
+ o 6:bdf645eb43bb bumped update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
@@ -453,24 +450,24 @@
---------------------------------------------------------------
$ hg evolve --phase-divergent
- recreate:[7] foo to bar
- atop:[6] added bar to bar
+ recreate:[9] foo to bar
+ atop:[7] added bar to bar
computing new diff
- committed as 502e73736632
- working directory is now at 502e73736632
+ committed as 73f67b6cf2c4
+ working directory is now at 73f67b6cf2c4
$ hg exp
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 502e737366322886cf628276aa0a2796904453b4
- # Parent b756eb10ea73ee4ba69c998e64a5c6e1005d74b5
- phase-divergent update to b756eb10ea73:
+ # Node ID 73f67b6cf2c428075c41d377f8651912e0d8cae2
+ # Parent 6176b60d16d20d69c77bb27c2a1b79caec671612
+ bumped update to 6176b60d16d2:
foo to bar
- diff -r b756eb10ea73 -r 502e73736632 bar
+ diff -r 6176b60d16d2 -r 73f67b6cf2c4 bar
--- a/bar Thu Jan 01 00:00:00 1970 +0000
+++ b/bar Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
@@ -478,11 +475,11 @@
+foo
$ hg glog
- @ 8:502e73736632 phase-divergent update to b756eb10ea73:
+ @ 10:73f67b6cf2c4 bumped update to 6176b60d16d2:
| (bm) draft
- o 6:b756eb10ea73 added bar to bar
+ o 7:6176b60d16d2 added bar to bar
| () public
- o 5:3d62500c673d phase-divergent update to aa071e5554e3:
+ o 6:bdf645eb43bb bumped update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
@@ -501,7 +498,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 2 new obsolescence markers
+ 3 new obsolescence markers
$ hg push ../public
pushing to ../public
searching for changes
@@ -509,7 +506,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 2 new obsolescence markers
+ 3 new obsolescence markers
Creating phase-divergence with divergent changeset and precursor having
different parents
@@ -540,8 +537,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- 2 new obsolescence markers
- new changesets 502e73736632:2352021b3785
+ 3 new obsolescence markers
(run 'hg update' to get a working copy)
$ hg push ../public
pushing to ../public
@@ -556,19 +552,19 @@
$ cd ../alice
$ hg rebase -r . -d .^^^
- rebasing 9:2352021b3785 "added x to x" (bm tip)
+ rebasing 11:ae81846887bc "added x to x" (tip bm)
$ hg pull ../public
pulling from ../public
searching for changes
no changes found
- 1 new phase-divergent changesets
+ 1 new bumped changesets
$ hg obslog -r .
- @ 334e300d6db5 (10) added x to x
+ @ 5cc37876a882 (12) added x to x
|
- o 2352021b3785 (9) added x to x
- rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ o ae81846887bc (11) added x to x
+ rewritten(parent) as 5cc37876a882 by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg glog -r .^::
hg: parse error at 4: not a prefix: end
@@ -578,23 +574,23 @@
---------------------------------------------
$ hg evolve --phase-divergent
- recreate:[10] added x to x
- atop:[9] added x to x
- rebasing to destination parent: 502e73736632
+ recreate:[12] added x to x
+ atop:[11] added x to x
+ rebasing to destination parent: 73f67b6cf2c4
(leaving bookmark bm)
computing new diff
- committed as 2352021b3785
- working directory is now at 2352021b3785
+ committed as ae81846887bc
+ working directory is now at ae81846887bc
XXX: we should move bookmark here
$ hg glog
- @ 9:2352021b3785 added x to x
+ @ 11:ae81846887bc added x to x
| (bm) public
- o 8:502e73736632 phase-divergent update to b756eb10ea73:
+ o 10:73f67b6cf2c4 bumped update to 6176b60d16d2:
| () public
- o 6:b756eb10ea73 added bar to bar
+ o 7:6176b60d16d2 added bar to bar
| () public
- o 5:3d62500c673d phase-divergent update to aa071e5554e3:
+ o 6:bdf645eb43bb bumped update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
@@ -603,15 +599,15 @@
o 0:d3873e73d99e init
() public
- $ hg obslog -r . b1a0e143e32b --all --hidden
- x b1a0e143e32b (11) added x to x
- | pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ $ hg obslog -r ae81846887bc --all --hidden
+ x 14c7c60e138f (13) added x to x
+ | pruned by test (Thu Jan 01 00:00:00 1970 +0000)
|
- x 334e300d6db5 (10) added x to x
- | rewritten(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+ x 5cc37876a882 (12) added x to x
+ | rewritten(parent) as 14c7c60e138f by test (Thu Jan 01 00:00:00 1970 +0000)
|
- @ 2352021b3785 (9) added x to x
- rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ @ ae81846887bc (11) added x to x
+ rewritten(parent) as 5cc37876a882 by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg exp
@@ -619,11 +615,11 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 2352021b37851be226ebed109b0eb6eada918566
- # Parent 502e737366322886cf628276aa0a2796904453b4
+ # Node ID ae81846887bc53e9ba17ea2172950677d1ba3a1d
+ # Parent 73f67b6cf2c428075c41d377f8651912e0d8cae2
added x to x
- diff -r 502e73736632 -r 2352021b3785 x
+ diff -r 73f67b6cf2c4 -r ae81846887bc x
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
@@ -636,13 +632,13 @@
Alice is tired of pushing and pulling and will create phase-divergence locally
$ hg glog
- @ 9:2352021b3785 added x to x
+ @ 11:ae81846887bc added x to x
| (bm) public
- o 8:502e73736632 phase-divergent update to b756eb10ea73:
+ o 10:73f67b6cf2c4 bumped update to 6176b60d16d2:
| () public
- o 6:b756eb10ea73 added bar to bar
+ o 7:6176b60d16d2 added bar to bar
| () public
- o 5:3d62500c673d phase-divergent update to aa071e5554e3:
+ o 6:bdf645eb43bb bumped update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
@@ -656,27 +652,27 @@
$ hg add y
$ hg ci -m "y to y and foobar to foo"
$ hg rebase -r . -d .^^^
- rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip)
+ rebasing 14:43dd61d1a393 "y to y and foobar to foo" (tip)
$ echo foo > y
$ hg amend
Alice making the old changeset public to have content-divergence
- $ hg phase -r dc88f5aa9bc9 --public --hidden
- 1 new phase-divergent changesets
+ $ hg phase -r 43dd61d1a393 --public --hidden
+ 1 new bumped changesets
$ hg glog
- @ 14:13015a180eee y to y and foobar to foo
+ @ 17:694790041d7d y to y and foobar to foo
| () draft
- | o 12:dc88f5aa9bc9 y to y and foobar to foo
+ | o 14:43dd61d1a393 y to y and foobar to foo
| | () public
- | o 9:2352021b3785 added x to x
+ | o 11:ae81846887bc added x to x
| | (bm) public
- | o 8:502e73736632 phase-divergent update to b756eb10ea73:
+ | o 10:73f67b6cf2c4 bumped update to 6176b60d16d2:
|/ () public
- o 6:b756eb10ea73 added bar to bar
+ o 7:6176b60d16d2 added bar to bar
| () public
- o 5:3d62500c673d phase-divergent update to aa071e5554e3:
+ o 6:bdf645eb43bb bumped update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
@@ -686,37 +682,37 @@
() public
$ hg obslog -r .
- @ 13015a180eee (14) y to y and foobar to foo
+ @ 694790041d7d (17) y to y and foobar to foo
|
- x 211ab84d1689 (13) y to y and foobar to foo
- | rewritten(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ x 9195657992dd (15) y to y and foobar to foo
+ | rewritten(content) as 694790041d7d by test (Thu Jan 01 00:00:00 1970 +0000)
|
- o dc88f5aa9bc9 (12) y to y and foobar to foo
- rewritten(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ o 43dd61d1a393 (14) y to y and foobar to foo
+ rewritten(parent) as 9195657992dd by test (Thu Jan 01 00:00:00 1970 +0000)
Resolving divergence using `hg evolve`
-------------------------------------
$ hg evolve --phase-divergent
- recreate:[14] y to y and foobar to foo
- atop:[12] y to y and foobar to foo
- rebasing to destination parent: 2352021b3785
+ recreate:[17] y to y and foobar to foo
+ atop:[14] y to y and foobar to foo
+ rebasing to destination parent: ae81846887bc
computing new diff
- committed as 8c2bb6fb44e9
- working directory is now at 8c2bb6fb44e9
+ committed as 8da44ebfc416
+ working directory is now at 8da44ebfc416
$ hg exp
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce
- # Parent dc88f5aa9bc90a6418899d267d9524205dfb429b
- phase-divergent update to dc88f5aa9bc9:
+ # Node ID 8da44ebfc416e3a6fc52c29f3a78e1d87c0d492e
+ # Parent 43dd61d1a393577a202514a924148969b8f74db8
+ bumped update to 43dd61d1a393:
y to y and foobar to foo
- diff -r dc88f5aa9bc9 -r 8c2bb6fb44e9 y
+ diff -r 43dd61d1a393 -r 8da44ebfc416 y
--- a/y Thu Jan 01 00:00:00 1970 +0000
+++ b/y Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
@@ -724,17 +720,17 @@
+foo
$ hg glog
- @ 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
+ @ 19:8da44ebfc416 bumped update to 43dd61d1a393:
| () draft
- o 12:dc88f5aa9bc9 y to y and foobar to foo
+ o 14:43dd61d1a393 y to y and foobar to foo
| () public
- o 9:2352021b3785 added x to x
+ o 11:ae81846887bc added x to x
| (bm) public
- o 8:502e73736632 phase-divergent update to b756eb10ea73:
+ o 10:73f67b6cf2c4 bumped update to 6176b60d16d2:
| () public
- o 6:b756eb10ea73 added bar to bar
+ o 7:6176b60d16d2 added bar to bar
| () public
- o 5:3d62500c673d phase-divergent update to aa071e5554e3:
+ o 6:bdf645eb43bb bumped update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
@@ -750,52 +746,52 @@
$ echo l > l
$ hg ci -Aqm "added l to l"
$ hg rebase -r . -d .^^^^
- rebasing 17:f3794e5a91dc "added l to l" (tip)
+ rebasing 20:515507bedb51 "added l to l" (tip)
$ echo kl > l
$ echo foo > x
$ hg add x
$ hg amend
$ hg obslog -r .
- @ 5fd38c0de46e (19) added l to l
+ @ e3c208c26c0c (23) added l to l
|
- x 2bfd56949cf0 (18) added l to l
- | rewritten(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ x c114000165ef (21) added l to l
+ | rewritten(content) as e3c208c26c0c by test (Thu Jan 01 00:00:00 1970 +0000)
|
- x f3794e5a91dc (17) added l to l
- rewritten(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ x 515507bedb51 (20) added l to l
+ rewritten(parent) as c114000165ef by test (Thu Jan 01 00:00:00 1970 +0000)
- $ hg phase -r f3794e5a91dc --public --hidden
- 1 new phase-divergent changesets
+ $ hg phase -r 515507bedb51 --public --hidden
+ 1 new bumped changesets
Resolution using `hg evolve --phase-divergent`
----------------------------------------------
$ hg evolve --phase-divergent
- recreate:[19] added l to l
- atop:[17] added l to l
- rebasing to destination parent: 8c2bb6fb44e9
+ recreate:[23] added l to l
+ atop:[20] added l to l
+ rebasing to destination parent: 8da44ebfc416
merging x
warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
[1]
$ hg diff
- diff -r 8c2bb6fb44e9 l
+ diff -r 8da44ebfc416 l
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/l Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@
+kl
- diff -r 8c2bb6fb44e9 x
+ diff -r 8da44ebfc416 x
--- a/x Thu Jan 01 00:00:00 1970 +0000
+++ b/x Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,5 @@
- +<<<<<<< destination: 8c2bb6fb44e9 - test: phase-divergent update to dc88f5aa9...
+ +<<<<<<< destination: 8da44ebfc416 - test: bumped update to 43dd61d1a393:
x
+=======
+foo
- +>>>>>>> evolving: 5fd38c0de46e - test: added l to l
+ +>>>>>>> evolving: e3c208c26c0c - test: added l to l
$ echo foo > x
@@ -804,27 +800,27 @@
continue: hg evolve --continue
$ hg evolve --continue
- evolving 19:5fd38c0de46e "added l to l"
+ evolving 23:e3c208c26c0c "added l to l"
computing new diff
- committed as e3090241a10c
- working directory is now at e3090241a10c
+ committed as 01e0d829c156
+ working directory is now at 01e0d829c156
$ hg glog
- @ 21:e3090241a10c phase-divergent update to f3794e5a91dc:
+ @ 25:01e0d829c156 bumped update to 515507bedb51:
| () draft
- o 17:f3794e5a91dc added l to l
+ o 20:515507bedb51 added l to l
| () public
- o 16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
+ o 19:8da44ebfc416 bumped update to 43dd61d1a393:
| () public
- o 12:dc88f5aa9bc9 y to y and foobar to foo
+ o 14:43dd61d1a393 y to y and foobar to foo
| () public
- o 9:2352021b3785 added x to x
+ o 11:ae81846887bc added x to x
| (bm) public
- o 8:502e73736632 phase-divergent update to b756eb10ea73:
+ o 10:73f67b6cf2c4 bumped update to 6176b60d16d2:
| () public
- o 6:b756eb10ea73 added bar to bar
+ o 7:6176b60d16d2 added bar to bar
| () public
- o 5:3d62500c673d phase-divergent update to aa071e5554e3:
+ o 6:bdf645eb43bb bumped update to aa071e5554e3:
| () public
o 3:aa071e5554e3 added foo to foo
| () public
@@ -838,19 +834,19 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID e3090241a10c320b6132e4673915fd6b19c0de39
- # Parent f3794e5a91dc1d4d36fee5c423386b19433a1f48
- phase-divergent update to f3794e5a91dc:
+ # Node ID 01e0d829c1560d8297062062dff671e272439e38
+ # Parent 515507bedb512ac15258c2ab44809645139055ef
+ bumped update to 515507bedb51:
added l to l
- diff -r f3794e5a91dc -r e3090241a10c l
+ diff -r 515507bedb51 -r 01e0d829c156 l
--- a/l Thu Jan 01 00:00:00 1970 +0000
+++ b/l Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
-l
+kl
- diff -r f3794e5a91dc -r e3090241a10c x
+ diff -r 515507bedb51 -r 01e0d829c156 x
--- a/x Thu Jan 01 00:00:00 1970 +0000
+++ b/x Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@
@@ -861,7 +857,7 @@
------------------------------------------------------------------------
$ hg glog -r .
- @ 21:e3090241a10c phase-divergent update to f3794e5a91dc:
+ @ 25:01e0d829c156 bumped update to 515507bedb51:
| () draft
~
$ echo f > f
@@ -875,45 +871,45 @@
$ hg evolve --list
- $ hg phase -r 428f7900a969 --public --hidden
- 1 new phase-divergent changesets
+ $ hg phase -r e86ee52bfd76 --public --hidden
+ 1 new bumped changesets
- $ hg glog -r f3794e5a91dc::
- @ 24:e450d05b7d27 added g
+ $ hg glog -r 515507bedb51::
+ @ 28:d83c51bdc098 added g
| () draft
- | o 23:428f7900a969 added g
+ | o 27:e86ee52bfd76 added g
| | () public
- | o 22:21ae52e414e6 added f
+ | o 26:d3c143cd906e added f
|/ () public
- o 21:e3090241a10c phase-divergent update to f3794e5a91dc:
+ o 25:01e0d829c156 bumped update to 515507bedb51:
| () public
- o 17:f3794e5a91dc added l to l
+ o 20:515507bedb51 added l to l
| () public
~
$ hg evolve --list
- e450d05b7d27: added g
- phase-divergent: 21ae52e414e6 (immutable precursor)
- phase-divergent: 428f7900a969 (immutable precursor)
+ d83c51bdc098: added g
+ bumped: d3c143cd906e (immutable precursor)
+ bumped: e86ee52bfd76 (immutable precursor)
Resolving phase divergence using `hg evolve`
$ hg evolve --phase-divergent --all
- recreate:[24] added g
- atop:[23] added g
- rebasing to destination parent: 21ae52e414e6
+ recreate:[28] added g
+ atop:[27] added g
+ rebasing to destination parent: d3c143cd906e
computing new diff
- committed as 428f7900a969
- working directory is now at 428f7900a969
+ committed as e86ee52bfd76
+ working directory is now at e86ee52bfd76
- $ hg glog -r f3794e5a91dc::
- @ 23:428f7900a969 added g
+ $ hg glog -r 515507bedb51::
+ @ 27:e86ee52bfd76 added g
| () public
- o 22:21ae52e414e6 added f
+ o 26:d3c143cd906e added f
| () public
- o 21:e3090241a10c phase-divergent update to f3794e5a91dc:
+ o 25:01e0d829c156 bumped update to 515507bedb51:
| () public
- o 17:f3794e5a91dc added l to l
+ o 20:515507bedb51 added l to l
| () public
~
@@ -924,112 +920,112 @@
$ echo n > n
$ hg ci -Aqm "added m and n"
- $ hg glog -r 21ae52e414e6::
- @ 26:849cee0a874b added m and n
+ $ hg glog -r d3c143cd906e::
+ @ 30:bbb1ce6e7cb5 added m and n
| () draft
- o 23:428f7900a969 added g
+ o 27:e86ee52bfd76 added g
| () public
- o 22:21ae52e414e6 added f
+ o 26:d3c143cd906e added f
| () public
~
$ hg prev
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- [23] added g
+ [27] added g
$ echo m > m
$ hg ci -Aqm "added m"
$ echo n > n
$ hg ci -Aqm "added n"
- $ hg glog -r 428f7900a969::
- @ 28:63ccb8ea7cae added n
+ $ hg glog -r e86ee52bfd76::
+ @ 32:e1e84fb7bd8c added n
| () draft
- o 27:f313e2b90e70 added m
+ o 31:38f8157363bc added m
| () draft
- | o 26:849cee0a874b added m and n
+ | o 30:bbb1ce6e7cb5 added m and n
|/ () draft
- o 23:428f7900a969 added g
+ o 27:e86ee52bfd76 added g
| () public
~
- $ hg prune -r 849cee0a874b --succ f313e2b90e70 --succ 63ccb8ea7cae --split
+ $ hg prune -r bbb1ce6e7cb5 --succ 38f8157363bc --succ e1e84fb7bd8c --split
1 changesets pruned
- $ hg phase -r 849cee0a874b --hidden --public
- 2 new phase-divergent changesets
+ $ hg phase -r bbb1ce6e7cb5 --hidden --public
+ 2 new bumped changesets
- $ hg glog -r 428f7900a969::
- @ 28:63ccb8ea7cae added n
+ $ hg glog -r e86ee52bfd76::
+ @ 32:e1e84fb7bd8c added n
| () draft
- o 27:f313e2b90e70 added m
+ o 31:38f8157363bc added m
| () draft
- | o 26:849cee0a874b added m and n
+ | o 30:bbb1ce6e7cb5 added m and n
|/ () public
- o 23:428f7900a969 added g
+ o 27:e86ee52bfd76 added g
| () public
~
$ hg evolve --all --phase-divergent
- recreate:[27] added m
- atop:[26] added m and n
+ recreate:[31] added m
+ atop:[30] added m and n
computing new diff
- committed as 870e1c3eddc3
- recreate:[28] added n
- atop:[26] added m and n
- rebasing to destination parent: 428f7900a969
+ committed as 26c0e0acbf58
+ recreate:[32] added n
+ atop:[30] added m and n
+ rebasing to destination parent: e86ee52bfd76
computing new diff
- committed as 154b0179fb9b
- working directory is now at 154b0179fb9b
+ committed as 167994483a30
+ working directory is now at 167994483a30
XXX: this is messy, we should solve things in better way
- $ hg glog -r 428f7900a969:: --hidden
- @ 31:154b0179fb9b phase-divergent update to 849cee0a874b:
+ $ hg glog -r e86ee52bfd76:: --hidden
+ @ 35:167994483a30 bumped update to bbb1ce6e7cb5:
| () draft
- | x 30:1ebf33547a82 added n
+ | x 34:ebca40be1c77 added n
| | () draft
- +---o 29:870e1c3eddc3 phase-divergent update to 849cee0a874b:
+ +---o 33:26c0e0acbf58 bumped update to bbb1ce6e7cb5:
| | () draft
- | | x 28:63ccb8ea7cae added n
+ | | x 32:e1e84fb7bd8c added n
| | | () draft
- | | x 27:f313e2b90e70 added m
+ | | x 31:38f8157363bc added m
| |/ () draft
- o | 26:849cee0a874b added m and n
+ o | 30:bbb1ce6e7cb5 added m and n
|/ () public
- o 23:428f7900a969 added g
+ o 27:e86ee52bfd76 added g
| () public
~
XXX: not sure this is the correct
- $ hg exp 154b0179fb9b
+ $ hg exp 167994483a30
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 154b0179fb9b53d2f853d6ba04740bb3d7a5cabe
- # Parent 849cee0a874be7c4e75dfacb5ad72aa5696951ba
- phase-divergent update to 849cee0a874b:
+ # Node ID 167994483a3052f6ea76aa4ba54bd0d6ecd03506
+ # Parent bbb1ce6e7cb56a4d0ddd9b602492c1e79f2beaf5
+ bumped update to bbb1ce6e7cb5:
added n
- diff -r 849cee0a874b -r 154b0179fb9b m
+ diff -r bbb1ce6e7cb5 -r 167994483a30 m
--- a/m Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-m
XXX: not sure this is correct
- $ hg exp 870e1c3eddc3
+ $ hg exp 26c0e0acbf58 --hidden
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 870e1c3eddc34cc475e8e13d2fe1934210c1937e
- # Parent 849cee0a874be7c4e75dfacb5ad72aa5696951ba
- phase-divergent update to 849cee0a874b:
+ # Node ID 26c0e0acbf58e4bd2a2414e43b7d2d8aefdbba60
+ # Parent bbb1ce6e7cb56a4d0ddd9b602492c1e79f2beaf5
+ bumped update to bbb1ce6e7cb5:
added m
- diff -r 849cee0a874b -r 870e1c3eddc3 n
+ diff -r bbb1ce6e7cb5 -r 26c0e0acbf58 n
--- a/n Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
@@ -1044,107 +1040,107 @@
$ hg prev
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- [31] phase-divergent update to 849cee0a874b:
+ [35] bumped update to bbb1ce6e7cb5:
$ echo p > p
$ hg ci -Aqm "added p"
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- [31] phase-divergent update to 849cee0a874b:
+ [35] bumped update to bbb1ce6e7cb5:
$ echo q > q
$ hg ci -Aqm "added q"
- $ hg glog -r 154b0179fb9b::
- @ 34:e046341aa97c added q
+ $ hg glog -r 167994483a30::
+ @ 38:25009377929c added q
| () draft
- | o 33:6f8c250eecff added p
+ | o 37:a27f3cc92c8f added p
|/ () draft
- | o 32:8a70f55b2af3 added p and q
+ | o 36:f695c2c8812d added p and q
|/ () draft
- o 31:154b0179fb9b phase-divergent update to 849cee0a874b:
+ o 35:167994483a30 bumped update to bbb1ce6e7cb5:
| () draft
~
- $ hg prune -r 8a70f55b2af3 --succ 6f8c250eecff --succ e046341aa97c --split
+ $ hg prune -r f695c2c8812d --succ a27f3cc92c8f --succ 25009377929c --split
1 changesets pruned
- $ hg phase -r 8a70f55b2af3 --public --hidden
- 2 new phase-divergent changesets
+ $ hg phase -r f695c2c8812d --public --hidden
+ 2 new bumped changesets
- $ hg glog -r 154b0179fb9b::
- @ 34:e046341aa97c added q
+ $ hg glog -r 167994483a30::
+ @ 38:25009377929c added q
| () draft
- | o 33:6f8c250eecff added p
+ | o 37:a27f3cc92c8f added p
|/ () draft
- | o 32:8a70f55b2af3 added p and q
+ | o 36:f695c2c8812d added p and q
|/ () public
- o 31:154b0179fb9b phase-divergent update to 849cee0a874b:
+ o 35:167994483a30 bumped update to bbb1ce6e7cb5:
| () public
~
$ hg evolve --list
- 6f8c250eecff: added p
- phase-divergent: 8a70f55b2af3 (immutable precursor)
+ a27f3cc92c8f: added p
+ bumped: f695c2c8812d (immutable precursor)
- e046341aa97c: added q
- phase-divergent: 8a70f55b2af3 (immutable precursor)
+ 25009377929c: added q
+ bumped: f695c2c8812d (immutable precursor)
$ hg evolve --all --phase-divergent
- recreate:[33] added p
- atop:[32] added p and q
+ recreate:[37] added p
+ atop:[36] added p and q
computing new diff
- committed as f3e41d89b3c5
- recreate:[34] added q
- atop:[32] added p and q
+ committed as abd19926ab01
+ recreate:[38] added q
+ atop:[36] added p and q
computing new diff
- committed as 605c306d4f87
- working directory is now at 605c306d4f87
+ committed as 12c31db4edf9
+ working directory is now at 12c31db4edf9
- $ hg glog -r 154b0179fb9b:: --hidden
- @ 36:605c306d4f87 phase-divergent update to 8a70f55b2af3:
+ $ hg glog -r 167994483a30:: --hidden
+ @ 40:12c31db4edf9 bumped update to f695c2c8812d:
| () draft
- | o 35:f3e41d89b3c5 phase-divergent update to 8a70f55b2af3:
+ | o 39:abd19926ab01 bumped update to f695c2c8812d:
|/ () draft
- | x 34:e046341aa97c added q
+ | x 38:25009377929c added q
| | () draft
- | | x 33:6f8c250eecff added p
+ | | x 37:a27f3cc92c8f added p
| |/ () draft
- o | 32:8a70f55b2af3 added p and q
+ o | 36:f695c2c8812d added p and q
|/ () public
- o 31:154b0179fb9b phase-divergent update to 849cee0a874b:
+ o 35:167994483a30 bumped update to bbb1ce6e7cb5:
| () public
~
XXX: not sure this is correct
- $ hg exp 605c306d4f87
+ $ hg exp 12c31db4edf9
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 605c306d4f87fccfdb5e7dd1c750b6d4f813defb
- # Parent 8a70f55b2af35452916dc89401a5ecf6553646a5
- phase-divergent update to 8a70f55b2af3:
+ # Node ID 12c31db4edf9a889e3ce9986f484bbf939f4fb42
+ # Parent f695c2c8812d12a910a47440ee189e553326a1c8
+ bumped update to f695c2c8812d:
added q
- diff -r 8a70f55b2af3 -r 605c306d4f87 p
+ diff -r f695c2c8812d -r 12c31db4edf9 p
--- a/p Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-p
XXX: not sure this is correct
- $ hg exp f3e41d89b3c5
+ $ hg exp abd19926ab01
# HG changeset patch
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID f3e41d89b3c5f6ee49ccc734045856d7b025f048
- # Parent 8a70f55b2af35452916dc89401a5ecf6553646a5
- phase-divergent update to 8a70f55b2af3:
+ # Node ID abd19926ab0109f43f38e732cfa8ae747e2e4187
+ # Parent f695c2c8812d12a910a47440ee189e553326a1c8
+ bumped update to f695c2c8812d:
added p
- diff -r 8a70f55b2af3 -r f3e41d89b3c5 q
+ diff -r f695c2c8812d -r abd19926ab01 q
--- a/q Thu Jan 01 00:00:00 1970 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
@@ -1153,14 +1149,14 @@
Testing the evolution of a phase-divergent merge with no conflicts
------------------------------------------------------------------
- $ hg glog -r 154b0179fb9b::
- @ 36:605c306d4f87 phase-divergent update to 8a70f55b2af3:
+ $ hg glog -r 167994483a30::
+ @ 40:12c31db4edf9 bumped update to f695c2c8812d:
| () draft
- | o 35:f3e41d89b3c5 phase-divergent update to 8a70f55b2af3:
+ | o 39:abd19926ab01 bumped update to f695c2c8812d:
|/ () draft
- o 32:8a70f55b2af3 added p and q
+ o 36:f695c2c8812d added p and q
| () public
- o 31:154b0179fb9b phase-divergent update to 849cee0a874b:
+ o 35:167994483a30 bumped update to bbb1ce6e7cb5:
| () public
~
@@ -1168,53 +1164,53 @@
$ hg ci -Aqm "added h"
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- [36] phase-divergent update to 8a70f55b2af3:
+ [40] bumped update to f695c2c8812d:
$ echo i > i
$ hg ci -Aqm "added i"
- $ hg merge -r ef8c23f37b55
+ $ hg merge -r 'desc("added h")'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "merge h and i"
- $ hg glog -r 605c306d4f87::
- @ 39:12ebe0d625d7 merge h and i
+ $ hg glog -r 12c31db4edf9::
+ @ 43:98ce636fa344 merge h and i
|\ () draft
- | o 38:9bb561db4230 added i
+ | o 42:c13ebd59dd4e added i
| | () draft
- o | 37:ef8c23f37b55 added h
+ o | 41:10bb6c8a838f added h
|/ () draft
- o 36:605c306d4f87 phase-divergent update to 8a70f55b2af3:
+ o 40:12c31db4edf9 bumped update to f695c2c8812d:
| () draft
~
- $ hg up ef8c23f37b55
+ $ hg up 10bb6c8a838f
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ hg merge -r 9bb561db4230
+ $ hg merge -r c13ebd59dd4e
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -m "merge h and i successor"
created new head
- $ hg glog -r 605c306d4f87::
- @ 40:d2aeda868461 merge h and i successor
+ $ hg glog -r 12c31db4edf9::
+ @ 44:57c7c43469f2 merge h and i successor
|\ () draft
- +---o 39:12ebe0d625d7 merge h and i
+ +---o 43:98ce636fa344 merge h and i
| |/ () draft
- | o 38:9bb561db4230 added i
+ | o 42:c13ebd59dd4e added i
| | () draft
- o | 37:ef8c23f37b55 added h
+ o | 41:10bb6c8a838f added h
|/ () draft
- o 36:605c306d4f87 phase-divergent update to 8a70f55b2af3:
+ o 40:12c31db4edf9 bumped update to f695c2c8812d:
| () draft
~
- $ hg prune -r 12ebe0d625d7 --succ .
+ $ hg prune -r 98ce636fa344 --succ .
1 changesets pruned
- $ hg phase 12ebe0d625d7 --hidden --public
- 1 new phase-divergent changesets
+ $ hg phase 98ce636fa344 --hidden --public
+ 1 new bumped changesets
Resolution of phase-divergent merge commit using `hg evolve`
XXX: we should handle phase-divergent merges
$ hg evolve --phase-divergent
- skipping d2aeda868461 : we do not handle merge yet
+ skipping 57c7c43469f2 : we do not handle merge yet
--- a/tests/test-evolve-phase.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-phase.t Thu Oct 25 16:33:10 2018 +0200
@@ -32,15 +32,15 @@
[1] b
$ echo b2>b
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg evolve
move:[2] c
- atop:[3] b
+ atop:[4] b
working directory is now at 813dde83a7f3
$ hg glog
- @ 4 - 813dde83a7f3 c (secret)
+ @ 5 - 813dde83a7f3 c (secret)
|
- o 3 - fd89d0f19529 b (draft)
+ o 4 - fd89d0f19529 b (draft)
|
o 0 - cb9a9f314b8b a (draft)
@@ -70,10 +70,10 @@
[1] b
$ echo b2 > a
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg glog
- @ 3 - 87495ea7c9ec b (draft)
+ @ 4 - 87495ea7c9ec b (draft)
|
| o 2 - 13833940840c c (secret)
| |
@@ -83,7 +83,7 @@
$ hg evolve
move:[2] c
- atop:[3] b
+ atop:[4] b
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -101,7 +101,7 @@
+>>>>>>> evolving: 13833940840c - test: c
$ hg glog
- @ 3 - 87495ea7c9ec b (draft)
+ @ 4 - 87495ea7c9ec b (draft)
|
| @ 2 - 13833940840c c (secret)
| |
@@ -119,9 +119,9 @@
working directory is now at 3d2080c198e5
$ hg glog
- @ 4 - 3d2080c198e5 c (secret)
+ @ 5 - 3d2080c198e5 c (secret)
|
- o 3 - 87495ea7c9ec b (draft)
+ o 4 - 87495ea7c9ec b (draft)
|
o 0 - cb9a9f314b8b a (draft)
--- a/tests/test-evolve-serveronly-bundle2.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-serveronly-bundle2.t Thu Oct 25 16:33:10 2018 +0200
@@ -72,7 +72,6 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets 8685c6d34325:4957bfdac07e
(run 'hg update' to get a working copy)
$ cat ../errors.log
$ hg push -R ../other
@@ -108,7 +107,7 @@
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
- remote: 1 new obsolescence markers
+ remote: 2 new obsolescence markers
remote: obsoleted 1 changesets
$ cat ../errors.log
$ hg push
@@ -128,9 +127,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
- 1 new obsolescence markers
+ 2 new obsolescence markers
obsoleted 1 changesets
- new changesets 9d1c114e7797
(run 'hg heads' to see heads)
$ cat ../errors.log
$ hg -R ../other pull
--- a/tests/test-evolve-split.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-split.t Thu Oct 25 16:33:10 2018 +0200
@@ -44,7 +44,7 @@
$ hg commit -m "_pp"
$ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
1 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg log -G
@ 4:d0dcf24cddd3@default(draft) _pp
|
--- a/tests/test-evolve-stop-contentdiv.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-stop-contentdiv.t Thu Oct 25 16:33:10 2018 +0200
@@ -48,12 +48,16 @@
$ echo foobar > d
$ hg amend
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg glog --hidden
- @ 6:9c1631e352d9 added d
+ @ 8:9c1631e352d9 added d
| () draft
- | o 5:e49523854bc8 added d
- |/ () draft
+ | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
+ | | () draft
+ +---o 6:e49523854bc8 added d
+ | | () draft
+ | | x 5:14721514d41c temporary amend commit for c41c793e0ef1
+ | |/ () draft
| x 4:c41c793e0ef1 added d
|/ () draft
o 3:ca1b80f7960a added c
@@ -66,10 +70,10 @@
() draft
$ hg evolve --content-divergent
- merge:[6] added d
- with: [5] added d
+ merge:[8] added d
+ with: [6] added d
base: [4] added d
- merging "other" content-divergent changeset 'e49523854bc8'
+ merging "other" divergent changeset 'e49523854bc8'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -81,10 +85,14 @@
working directory is now at 9c1631e352d9
$ hg glog --hidden
- @ 6:9c1631e352d9 added d
+ @ 8:9c1631e352d9 added d
| () draft
- | o 5:e49523854bc8 added d
- |/ () draft
+ | x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
+ | | () draft
+ +---o 6:e49523854bc8 added d
+ | | () draft
+ | | x 5:14721514d41c temporary amend commit for c41c793e0ef1
+ | |/ () draft
| x 4:c41c793e0ef1 added d
|/ () draft
o 3:ca1b80f7960a added c
@@ -101,12 +109,12 @@
---------------------------------------------------------------------------
$ hg rebase -r . -d .^^^ --config extensions.rebase=
- rebasing 6:9c1631e352d9 "added d" (tip)
+ rebasing 8:9c1631e352d9 "added d" (tip)
$ hg glog
- @ 7:517d4375cb72 added d
+ @ 9:517d4375cb72 added d
| () draft
- | o 5:e49523854bc8 added d
+ | o 6:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -118,12 +126,12 @@
() draft
$ hg evolve --content-divergent
- merge:[5] added d
- with: [7] added d
+ merge:[6] added d
+ with: [9] added d
base: [4] added d
rebasing "other" content-divergent changeset 517d4375cb72 on ca1b80f7960a
updating to "local" side of the conflict: e49523854bc8
- merging "other" content-divergent changeset '606ad96040fc'
+ merging "other" divergent changeset '606ad96040fc'
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -135,9 +143,9 @@
working directory is now at 517d4375cb72
$ hg glog
- @ 7:517d4375cb72 added d
+ @ 9:517d4375cb72 added d
| () draft
- | o 5:e49523854bc8 added d
+ | o 6:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -156,9 +164,9 @@
$ hg add c
$ hg amend
$ hg glog
- @ 8:8fd1c4bd144c added d
+ @ 11:8fd1c4bd144c added d
| () draft
- | o 5:e49523854bc8 added d
+ | o 6:e49523854bc8 added d
| | () draft
| o 3:ca1b80f7960a added c
| | () draft
@@ -170,8 +178,8 @@
() draft
$ hg evolve --content-divergent
- merge:[5] added d
- with: [8] added d
+ merge:[6] added d
+ with: [11] added d
base: [4] added d
rebasing "other" content-divergent changeset 8fd1c4bd144c on ca1b80f7960a
merging c
@@ -201,9 +209,9 @@
XXX: we should have preserved the wdir to be at rev 8
$ hg glog
- o 8:8fd1c4bd144c added d
+ o 11:8fd1c4bd144c added d
| () draft
- | o 5:e49523854bc8 added d
+ | o 6:e49523854bc8 added d
| | () draft
| @ 3:ca1b80f7960a added c
| | () draft
--- a/tests/test-evolve-stop-orphan.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-stop-orphan.t Thu Oct 25 16:33:10 2018 +0200
@@ -70,9 +70,9 @@
$ echo bar > d
$ hg add d
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg glog
- @ 5:cb6a2ab625bb added c
+ @ 6:cb6a2ab625bb added c
| () draft
| o 4:c41c793e0ef1 added d
| | () draft
@@ -87,7 +87,7 @@
$ hg evolve
move:[4] added d
- atop:[5] added c
+ atop:[6] added c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -115,7 +115,7 @@
Checking graph
$ hg glog
- @ 5:cb6a2ab625bb added c
+ @ 6:cb6a2ab625bb added c
| () draft
| o 4:c41c793e0ef1 added d
| | () draft
@@ -133,7 +133,7 @@
$ hg next --evolve
move:[4] added d
- atop:[5] added c
+ atop:[6] added c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -155,7 +155,7 @@
working directory is now at cb6a2ab625bb
$ hg glog
- @ 5:cb6a2ab625bb added c
+ @ 6:cb6a2ab625bb added c
| () draft
| o 4:c41c793e0ef1 added d
| | () draft
@@ -193,7 +193,7 @@
$ hg evolve
move:[4] added d
- atop:[5] added c
+ atop:[6] added c
merging d
warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -206,9 +206,9 @@
evolving 4:c41c793e0ef1 "added d"
working directory is now at 2a4e03d422e2
$ hg glog
- @ 6:2a4e03d422e2 added d
+ @ 7:2a4e03d422e2 added d
| () draft
- o 5:cb6a2ab625bb added c
+ o 6:cb6a2ab625bb added c
| () draft
o 2:b1661037fa25 added b
| () draft
@@ -222,14 +222,14 @@
$ echo bar > c
$ hg add c
$ hg amend
- 4 new orphan changesets
+ 4 new unstable changesets
$ hg glog
- @ 7:21817cd42526 added hgignore
+ @ 9:21817cd42526 added hgignore
() draft
- o 6:2a4e03d422e2 added d
+ o 7:2a4e03d422e2 added d
| () draft
- o 5:cb6a2ab625bb added c
+ o 6:cb6a2ab625bb added c
| () draft
o 2:b1661037fa25 added b
| () draft
@@ -240,9 +240,9 @@
$ hg evolve --all
move:[1] added a
- atop:[7] added hgignore
+ atop:[9] added hgignore
move:[2] added b
- move:[5] added c
+ move:[6] added c
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -258,15 +258,15 @@
Only changeset which has a successor now are obsoleted
$ hg glog
- @ 9:aec285328e90 added b
+ @ 11:aec285328e90 added b
| () draft
- o 8:fd00db71edca added a
+ o 10:fd00db71edca added a
| () draft
- o 7:21817cd42526 added hgignore
+ o 9:21817cd42526 added hgignore
() draft
- o 6:2a4e03d422e2 added d
+ o 7:2a4e03d422e2 added d
| () draft
- o 5:cb6a2ab625bb added c
+ o 6:cb6a2ab625bb added c
| () draft
x 2:b1661037fa25 added b
| () draft
@@ -278,8 +278,8 @@
Making sure doing evolve again resumes from right place and does the right thing
$ hg evolve --all
- move:[5] added c
- atop:[9] added b
+ move:[6] added c
+ atop:[11] added b
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -290,20 +290,20 @@
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- evolving 5:cb6a2ab625bb "added c"
- move:[6] added d
- atop:[10] added c
+ evolving 6:cb6a2ab625bb "added c"
+ move:[7] added d
+ atop:[12] added c
working directory is now at cd0909a30222
$ hg glog
- @ 11:cd0909a30222 added d
+ @ 13:cd0909a30222 added d
| () draft
- o 10:cb1dd1086ef6 added c
+ o 12:cb1dd1086ef6 added c
| () draft
- o 9:aec285328e90 added b
+ o 11:aec285328e90 added b
| () draft
- o 8:fd00db71edca added a
+ o 10:fd00db71edca added a
| () draft
- o 7:21817cd42526 added hgignore
+ o 9:21817cd42526 added hgignore
() draft
Bookmarks should only be moved of the changesets which have been evolved,
@@ -319,42 +319,42 @@
$ hg bookmark b2
$ hg glog
- o 11:cd0909a30222 added d
+ o 13:cd0909a30222 added d
| () draft
- o 10:cb1dd1086ef6 added c
+ o 12:cb1dd1086ef6 added c
| (b1) draft
- @ 9:aec285328e90 added b
+ @ 11:aec285328e90 added b
| (b2) draft
- o 8:fd00db71edca added a
+ o 10:fd00db71edca added a
| () draft
- o 7:21817cd42526 added hgignore
+ o 9:21817cd42526 added hgignore
() draft
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- [8] added a
+ [10] added a
$ echo tom > c
$ hg amend
- 3 new orphan changesets
+ 3 new unstable changesets
$ hg glog
- @ 12:a3cc2042492f added a
+ @ 15:a3cc2042492f added a
| () draft
- | o 11:cd0909a30222 added d
+ | o 13:cd0909a30222 added d
| | () draft
- | o 10:cb1dd1086ef6 added c
+ | o 12:cb1dd1086ef6 added c
| | (b1) draft
- | o 9:aec285328e90 added b
+ | o 11:aec285328e90 added b
| | (b2) draft
- | x 8:fd00db71edca added a
+ | x 10:fd00db71edca added a
|/ () draft
- o 7:21817cd42526 added hgignore
+ o 9:21817cd42526 added hgignore
() draft
$ hg evolve --all
- move:[9] added b
- atop:[12] added a
- move:[10] added c
+ move:[11] added b
+ atop:[15] added a
+ move:[12] added c
merging c
warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -366,17 +366,17 @@
Bookmarks of only the changeset which are evolved is moved
$ hg glog
- @ 13:a3f4b95da934 added b
+ @ 16:a3f4b95da934 added b
| (b2) draft
- o 12:a3cc2042492f added a
+ o 15:a3cc2042492f added a
| () draft
- | o 11:cd0909a30222 added d
+ | o 13:cd0909a30222 added d
| | () draft
- | o 10:cb1dd1086ef6 added c
+ | o 12:cb1dd1086ef6 added c
| | (b1) draft
- | x 9:aec285328e90 added b
+ | x 11:aec285328e90 added b
| | () draft
- | x 8:fd00db71edca added a
+ | x 10:fd00db71edca added a
|/ () draft
- o 7:21817cd42526 added hgignore
+ o 9:21817cd42526 added hgignore
() draft
--- a/tests/test-evolve-templates.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-templates.t Thu Oct 25 16:33:10 2018 +0200
@@ -35,24 +35,30 @@
$ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0"
$ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0"
$ hg log --hidden -G
- @ changeset: 3:d004c8f274b9
+ @ changeset: 4:d004c8f274b9
| tag: tip
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: A2
|
- | x changeset: 2:a468dc9b3633
+ | x changeset: 3:a468dc9b3633
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 3:d004c8f274b9 by test2
+ | obsolete: reworded as d004c8f274b9 by test2
| summary: A1
|
+ | x changeset: 2:f137d23bb3e1
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | obsolete: pruned
+ | | summary: temporary amend commit for 471f378eab4c
+ | |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using amend as 2:a468dc9b3633
+ | obsolete: rewritten as a468dc9b3633
| summary: A0
|
o changeset: 0:ea207398892e
@@ -69,28 +75,28 @@
Precursors template should show current revision as it is the working copy
$ hg olog tip
- o d004c8f274b9 (3) A2
+ o d004c8f274b9 (4) A2
|
- x a468dc9b3633 (2) A1
- | rewritten(description) as d004c8f274b9 using amend by test2 (Thu Apr 19 04:25:21 2001 +0000)
+ x a468dc9b3633 (3) A1
+ | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000)
|
@ 471f378eab4c (1) A0
- rewritten(description, content) as a468dc9b3633 using amend by test (Fri Feb 13 23:31:30 2009 +0000)
+ rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000)
$ hg tlog
o d004c8f274b9
| Precursors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
| @ 471f378eab4c
- |/ Successors: 3:d004c8f274b9
- | semi-colon: 3:d004c8f274b9
- | Fate: rewritten using amend as 3:d004c8f274b9 by test, test2
+ |/ Successors: 4:d004c8f274b9
+ | semi-colon: 4:d004c8f274b9
+ | Fate: rewritten as d004c8f274b9 by test, test2
|
o ea207398892e
$ hg log -G
- o changeset: 3:d004c8f274b9
+ o changeset: 4:d004c8f274b9
| tag: tip
| parent: 0:ea207398892e
| user: test
@@ -100,7 +106,7 @@
| @ changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2
+ | obsolete: rewritten as d004c8f274b9 by test, test2
| summary: A0
|
o changeset: 0:ea207398892e
@@ -113,7 +119,7 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using amend as 3:d004c8f274b9
+ |/ Obsfate: rewritten as d004c8f274b9
|
o ea207398892e
@@ -122,7 +128,7 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
+ |/ Obsfate: rewritten as d004c8f274b9 by test, test2
|
o ea207398892e
@@ -130,7 +136,7 @@
o d004c8f274b9
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
+ |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
|
o ea207398892e
@@ -161,12 +167,12 @@
Precursors template should show current revision as it is the working copy
$ hg tlog
o d004c8f274b9
- | Precursors: 2:a468dc9b3633
- | semi-colon: 2:a468dc9b3633
+ | Precursors: 3:a468dc9b3633
+ | semi-colon: 3:a468dc9b3633
| @ a468dc9b3633
- |/ Successors: 3:d004c8f274b9
- | semi-colon: 3:d004c8f274b9
- | Fate: reworded using amend as 3:d004c8f274b9 by test2
+ |/ Successors: 4:d004c8f274b9
+ | semi-colon: 4:d004c8f274b9
+ | Fate: reworded as d004c8f274b9 by test2
|
o ea207398892e
@@ -174,27 +180,22 @@
--hidden
$ hg tlog --hidden
o d004c8f274b9
- | Precursors: 2:a468dc9b3633
- | semi-colon: 2:a468dc9b3633
+ | Precursors: 3:a468dc9b3633
+ | semi-colon: 3:a468dc9b3633
| @ a468dc9b3633
|/ Precursors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
- | Successors: 3:d004c8f274b9
- | semi-colon: 3:d004c8f274b9
- | Fate: reworded using amend as 3:d004c8f274b9 by test2
+ | Successors: 4:d004c8f274b9
+ | semi-colon: 4:d004c8f274b9
+ | Fate: reworded as d004c8f274b9 by test2
|
+ | x f137d23bb3e1
+ | | Fate: pruned
+ | |
| x 471f378eab4c
- |/ Successors: 2:a468dc9b3633
- | semi-colon: 2:a468dc9b3633
- | Fate: rewritten using amend as 2:a468dc9b3633
- |
- o ea207398892e
-
- $ hg fatelog -v
- o d004c8f274b9
- |
- | @ a468dc9b3633
- |/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+ |/ Successors: 3:a468dc9b3633
+ | semi-colon: 3:a468dc9b3633
+ | Fate: rewritten as a468dc9b3633
|
o ea207398892e
@@ -207,19 +208,22 @@
$ hg tlog --hidden
@ d004c8f274b9
- | Precursors: 2:a468dc9b3633
- | semi-colon: 2:a468dc9b3633
+ | Precursors: 3:a468dc9b3633
+ | semi-colon: 3:a468dc9b3633
| x a468dc9b3633
|/ Precursors: 1:471f378eab4c
| semi-colon: 1:471f378eab4c
- | Successors: 3:d004c8f274b9
- | semi-colon: 3:d004c8f274b9
- | Fate: reworded using amend as 3:d004c8f274b9 by test2
+ | Successors: 4:d004c8f274b9
+ | semi-colon: 4:d004c8f274b9
+ | Fate: reworded as d004c8f274b9 by test2
|
+ | x f137d23bb3e1
+ | | Fate: pruned
+ | |
| x 471f378eab4c
- |/ Successors: 2:a468dc9b3633
- | semi-colon: 2:a468dc9b3633
- | Fate: rewritten using amend as 2:a468dc9b3633
+ |/ Successors: 3:a468dc9b3633
+ | semi-colon: 3:a468dc9b3633
+ | Fate: rewritten as a468dc9b3633
|
o ea207398892e
@@ -233,10 +237,13 @@
@ d004c8f274b9
|
| x a468dc9b3633
- |/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+ |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
|
+ | x f137d23bb3e1
+ | | Obsfate: pruned by test (at 2009-02-13 23:31 +0000)
+ | |
| x 471f378eab4c
- |/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
+ |/ Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
|
o ea207398892e
@@ -315,7 +322,7 @@
| x changeset: 1:471597cad322
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a
+ | obsolete: split as 337fec4d2edc, f257fde29c7a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -343,7 +350,7 @@
| @ 471597cad322
|/ Successors: 2:337fec4d2edc 3:f257fde29c7a
| semi-colon: 2:337fec4d2edc 3:f257fde29c7a
- | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
+ | Fate: split as 337fec4d2edc, f257fde29c7a
|
o ea207398892e
@@ -353,7 +360,7 @@
o 337fec4d2edc
|
| @ 471597cad322
- |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
+ |/ Obsfate: split as 337fec4d2edc, f257fde29c7a
|
o ea207398892e
@@ -382,7 +389,7 @@
| x 471597cad322
|/ Successors: 2:337fec4d2edc 3:f257fde29c7a
| semi-colon: 2:337fec4d2edc 3:f257fde29c7a
- | Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
+ | Fate: split as 337fec4d2edc, f257fde29c7a
|
o ea207398892e
@@ -392,7 +399,7 @@
o 337fec4d2edc
|
| x 471597cad322
- |/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
+ |/ Obsfate: split as 337fec4d2edc, f257fde29c7a
|
o ea207398892e
@@ -439,13 +446,13 @@
| x changeset: 2:0dec01379d3b
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten using fold as 3:eb5a0daa2192
+ | | obsolete: rewritten as eb5a0daa2192
| | summary: B0
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using fold as 3:eb5a0daa2192
+ | obsolete: rewritten as eb5a0daa2192
| summary: A0
|
o changeset: 0:ea207398892e
@@ -469,7 +476,7 @@
| @ 471f378eab4c
|/ Successors: 3:eb5a0daa2192
| semi-colon: 3:eb5a0daa2192
- | Fate: rewritten using fold as 3:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -477,7 +484,7 @@
o eb5a0daa2192
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -495,12 +502,12 @@
| @ 0dec01379d3b
| | Successors: 3:eb5a0daa2192
| | semi-colon: 3:eb5a0daa2192
- | | Fate: rewritten using fold as 3:eb5a0daa2192
+ | | Fate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
|/ Successors: 3:eb5a0daa2192
| semi-colon: 3:eb5a0daa2192
- | Fate: rewritten using fold as 3:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -508,10 +515,10 @@
o eb5a0daa2192
|
| @ 0dec01379d3b
- | | Obsfate: rewritten using fold as 3:eb5a0daa2192
+ | | Obsfate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
- |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -535,12 +542,12 @@
| x 0dec01379d3b
| | Successors: 3:eb5a0daa2192
| | semi-colon: 3:eb5a0daa2192
- | | Fate: rewritten using fold as 3:eb5a0daa2192
+ | | Fate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
|/ Successors: 3:eb5a0daa2192
| semi-colon: 3:eb5a0daa2192
- | Fate: rewritten using fold as 3:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -548,10 +555,10 @@
@ eb5a0daa2192
|
| x 0dec01379d3b
- | | Obsfate: rewritten using fold as 3:eb5a0daa2192
+ | | Obsfate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
- |/ Obsfate: rewritten using fold as 3:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -578,7 +585,7 @@
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 2:fdf9bde5129a
+ | obsolete: reworded as fdf9bde5129a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -591,28 +598,28 @@
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: fdf9bde5129a)
$ hg amend -m "A2"
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg log --hidden -G
@ changeset: 3:65b757b745b9
| tag: tip
| parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: A2
|
| o changeset: 2:fdf9bde5129a
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: A1
|
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 2:fdf9bde5129a
- | obsolete: reworded using amend as 3:65b757b745b9
+ | obsolete: reworded as fdf9bde5129a
+ | obsolete: reworded as 65b757b745b9
| summary: A0
|
o changeset: 0:ea207398892e
@@ -641,8 +648,8 @@
| @ 471f378eab4c
|/ Successors: 2:fdf9bde5129a; 4:019fadeab383
| semi-colon: 2:fdf9bde5129a; 4:019fadeab383
- | Fate: reworded using amend as 2:fdf9bde5129a
- | Fate: reworded using amend as 4:019fadeab383
+ | Fate: reworded as fdf9bde5129a
+ | Fate: reworded as 019fadeab383
|
o ea207398892e
@@ -652,7 +659,7 @@
| o fdf9bde5129a
|/
| @ 471f378eab4c
- |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
+ |/ Obsfate: reworded as fdf9bde5129a; reworded as 019fadeab383
|
o ea207398892e
@@ -686,7 +693,7 @@
| semi-colon: 1:471f378eab4c
| Successors: 4:019fadeab383
| semi-colon: 4:019fadeab383
- | Fate: reworded using amend as 4:019fadeab383
+ | Fate: reworded as 019fadeab383
|
| @ fdf9bde5129a
|/ Precursors: 1:471f378eab4c
@@ -694,8 +701,8 @@
| x 471f378eab4c
|/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
| semi-colon: 2:fdf9bde5129a; 3:65b757b745b9
- | Fate: reworded using amend as 2:fdf9bde5129a
- | Fate: reworded using amend as 3:65b757b745b9
+ | Fate: reworded as fdf9bde5129a
+ | Fate: reworded as 65b757b745b9
|
o ea207398892e
@@ -703,12 +710,12 @@
o 019fadeab383
|
| x 65b757b745b9
- |/ Obsfate: reworded using amend as 4:019fadeab383
+ |/ Obsfate: reworded as 019fadeab383
|
| @ fdf9bde5129a
|/
| x 471f378eab4c
- |/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9
+ |/ Obsfate: reworded as fdf9bde5129a; reworded as 65b757b745b9
|
o ea207398892e
@@ -736,7 +743,7 @@
| x changeset: 2:0dec01379d3b
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 3:b7ea6d14e664
+ | obsolete: reworded as b7ea6d14e664
| summary: B0
|
o changeset: 1:471f378eab4c
@@ -764,19 +771,19 @@
| | parent: 1:471f378eab4c
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten using fold as 4:eb5a0daa2192
+ | | obsolete: rewritten as eb5a0daa2192
| | summary: B1
| |
| | x changeset: 2:0dec01379d3b
| |/ user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: reworded using amend as 3:b7ea6d14e664
+ | | obsolete: reworded as b7ea6d14e664
| | summary: B0
| |
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using fold as 4:eb5a0daa2192
+ | obsolete: rewritten as eb5a0daa2192
| summary: A0
|
o changeset: 0:ea207398892e
@@ -798,7 +805,7 @@
| @ 471f378eab4c
|/ Successors: 4:eb5a0daa2192
| semi-colon: 4:eb5a0daa2192
- | Fate: rewritten using fold as 4:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -806,7 +813,7 @@
o eb5a0daa2192
|
| @ 471f378eab4c
- |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -821,12 +828,12 @@
| @ 0dec01379d3b
| | Successors: 4:eb5a0daa2192
| | semi-colon: 4:eb5a0daa2192
- | | Fate: rewritten using amend, fold as 4:eb5a0daa2192
+ | | Fate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
|/ Successors: 4:eb5a0daa2192
| semi-colon: 4:eb5a0daa2192
- | Fate: rewritten using fold as 4:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -834,10 +841,10 @@
o eb5a0daa2192
|
| @ 0dec01379d3b
- | | Obsfate: rewritten using amend, fold as 4:eb5a0daa2192
+ | | Obsfate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
- |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -853,12 +860,12 @@
| @ b7ea6d14e664
| | Successors: 4:eb5a0daa2192
| | semi-colon: 4:eb5a0daa2192
- | | Fate: rewritten using fold as 4:eb5a0daa2192
+ | | Fate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
|/ Successors: 4:eb5a0daa2192
| semi-colon: 4:eb5a0daa2192
- | Fate: rewritten using fold as 4:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -866,10 +873,10 @@
o eb5a0daa2192
|
| @ b7ea6d14e664
- | | Obsfate: rewritten using fold as 4:eb5a0daa2192
+ | | Obsfate: rewritten as eb5a0daa2192
| |
| x 471f378eab4c
- |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -890,17 +897,17 @@
| | semi-colon: 2:0dec01379d3b
| | Successors: 4:eb5a0daa2192
| | semi-colon: 4:eb5a0daa2192
- | | Fate: rewritten using fold as 4:eb5a0daa2192
+ | | Fate: rewritten as eb5a0daa2192
| |
| | x 0dec01379d3b
| |/ Successors: 3:b7ea6d14e664
| | semi-colon: 3:b7ea6d14e664
- | | Fate: reworded using amend as 3:b7ea6d14e664
+ | | Fate: reworded as b7ea6d14e664
| |
| x 471f378eab4c
|/ Successors: 4:eb5a0daa2192
| semi-colon: 4:eb5a0daa2192
- | Fate: rewritten using fold as 4:eb5a0daa2192
+ | Fate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -908,13 +915,13 @@
@ eb5a0daa2192
|
| x b7ea6d14e664
- | | Obsfate: rewritten using fold as 4:eb5a0daa2192
+ | | Obsfate: rewritten as eb5a0daa2192
| |
| | x 0dec01379d3b
- | |/ Obsfate: reworded using amend as 3:b7ea6d14e664
+ | |/ Obsfate: reworded as b7ea6d14e664
| |
| x 471f378eab4c
- |/ Obsfate: rewritten using fold as 4:eb5a0daa2192
+ |/ Obsfate: rewritten as eb5a0daa2192
|
o ea207398892e
@@ -960,13 +967,13 @@
|/ parent: 0:ea207398892e
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 3:7a230b46bf61
+ | obsolete: reworded as 7a230b46bf61
| summary: A1
|
| x changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 2:fdf9bde5129a
+ | obsolete: reworded as fdf9bde5129a
| summary: A0
|
o changeset: 0:ea207398892e
@@ -984,7 +991,6 @@
added 1 changesets with 0 changes to 1 files (+1 heads)
2 new obsolescence markers
obsoleted 1 changesets
- new changesets 7a230b46bf61
(run 'hg heads' to see heads, 'hg merge' to merge)
working directory parent is obsolete! (471f378eab4c)
(use 'hg evolve' to update to its successor: 7a230b46bf61)
@@ -999,7 +1005,7 @@
| @ changeset: 1:471f378eab4c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 2:7a230b46bf61
+ | obsolete: reworded as 7a230b46bf61
| summary: A0
|
o changeset: 0:ea207398892e
@@ -1017,7 +1023,7 @@
| @ 471f378eab4c
|/ Successors: 2:7a230b46bf61
| semi-colon: 2:7a230b46bf61
- | Fate: reworded using amend as 2:7a230b46bf61
+ | Fate: reworded as 7a230b46bf61
|
o ea207398892e
@@ -1025,7 +1031,7 @@
o 7a230b46bf61
|
| @ 471f378eab4c
- |/ Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+ |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
|
o ea207398892e
@@ -1048,7 +1054,7 @@
| x 471f378eab4c
|/ Successors: 2:7a230b46bf61
| semi-colon: 2:7a230b46bf61
- | Fate: reworded using amend as 2:7a230b46bf61
+ | Fate: reworded as 7a230b46bf61
|
o ea207398892e
@@ -1056,7 +1062,7 @@
@ 7a230b46bf61
|
| x 471f378eab4c
- |/ Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+ |/ Obsfate: reworded as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
|
o ea207398892e
@@ -1111,15 +1117,15 @@
| | semi-colon: 1:471f378eab4c
| | Successors: 3:f897c6137566; 1:471f378eab4c
| | semi-colon: 3:f897c6137566; 1:471f378eab4c
- | | Fate: rewritten as 3:f897c6137566
- | | Fate: rewritten as 1:471f378eab4c
+ | | Fate: rewritten as f897c6137566
+ | | Fate: rewritten as 471f378eab4c
| |
| x 471f378eab4c
|/ Precursors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
| Successors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
- | Fate: rewritten as 2:0dec01379d3b
+ | Fate: rewritten as 0dec01379d3b
|
o ea207398892e
@@ -1127,10 +1133,10 @@
o f897c6137566
|
| @ 0dec01379d3b
- | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c
+ | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c
| |
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:0dec01379d3b
+ |/ Obsfate: rewritten as 0dec01379d3b
|
o ea207398892e
@@ -1177,15 +1183,15 @@
| | semi-colon: 1:471f378eab4c
| | Successors: 3:f897c6137566; 1:471f378eab4c
| | semi-colon: 3:f897c6137566; 1:471f378eab4c
- | | Fate: rewritten as 3:f897c6137566
- | | Fate: rewritten as 1:471f378eab4c
+ | | Fate: rewritten as f897c6137566
+ | | Fate: rewritten as 471f378eab4c
| |
| x 471f378eab4c
|/ Precursors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
| Successors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
- | Fate: rewritten as 2:0dec01379d3b
+ | Fate: rewritten as 0dec01379d3b
|
@ ea207398892e
@@ -1295,14 +1301,14 @@
$ hg up 6
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg commit --amend -m "Add only B"
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg up 6 --hidden
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory parent is obsolete! (4a004186e638)
(use 'hg evolve' to update to its successor: b18bc8331526)
$ hg commit --amend -m "Add B only"
- 4 new content-divergent changesets
+ 4 new divergent changesets
$ hg log -G
@ changeset: 9:0b997eb7ceee
@@ -1310,34 +1316,34 @@
| parent: 5:dd800401bd8c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: Add B only
|
| o changeset: 8:b18bc8331526
|/ parent: 5:dd800401bd8c
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: Add only B
|
| o changeset: 7:ba2ed02b0c9a
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan, content-divergent
+ | | trouble: unstable, divergent
| | summary: Add A,B,C
| |
| x changeset: 6:4a004186e638
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 8:b18bc8331526
- | obsolete: reworded using amend as 9:0b997eb7ceee
+ | obsolete: reworded as b18bc8331526
+ | obsolete: reworded as 0b997eb7ceee
| summary: Add A,B,C
|
o changeset: 5:dd800401bd8c
| parent: 3:f897c6137566
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: Add A,B,C
|
o changeset: 3:f897c6137566
@@ -1366,8 +1372,8 @@
| x 4a004186e638
|/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
| semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
- | Fate: reworded using amend as 8:b18bc8331526
- | Fate: reworded using amend as 9:0b997eb7ceee
+ | Fate: reworded as b18bc8331526
+ | Fate: reworded as 0b997eb7ceee
|
o dd800401bd8c
|
@@ -1383,7 +1389,7 @@
| o ba2ed02b0c9a
| |
| x 4a004186e638
- |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
+ |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee
|
o dd800401bd8c
|
@@ -1406,8 +1412,8 @@
| semi-colon: 4:9bd10a0775e4
| Successors: 8:b18bc8331526; 9:0b997eb7ceee
| semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
- | Fate: reworded using amend as 8:b18bc8331526
- | Fate: reworded using amend as 9:0b997eb7ceee
+ | Fate: reworded as b18bc8331526
+ | Fate: reworded as 0b997eb7ceee
|
o dd800401bd8c
| Precursors: 4:9bd10a0775e4
@@ -1415,7 +1421,7 @@
| x 9bd10a0775e4
|/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
| semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
- | Fate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
+ | Fate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c
|
o f897c6137566
| Precursors: 2:0dec01379d3b
@@ -1425,15 +1431,15 @@
| | semi-colon: 1:471f378eab4c
| | Successors: 3:f897c6137566; 1:471f378eab4c
| | semi-colon: 3:f897c6137566; 1:471f378eab4c
- | | Fate: rewritten as 3:f897c6137566
- | | Fate: rewritten as 1:471f378eab4c
+ | | Fate: rewritten as f897c6137566
+ | | Fate: rewritten as 471f378eab4c
| |
| x 471f378eab4c
|/ Precursors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
| Successors: 2:0dec01379d3b
| semi-colon: 2:0dec01379d3b
- | Fate: rewritten as 2:0dec01379d3b
+ | Fate: rewritten as 0dec01379d3b
|
o ea207398892e
@@ -1445,20 +1451,20 @@
| o ba2ed02b0c9a
| |
| x 4a004186e638
- |/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
+ |/ Obsfate: reworded as b18bc8331526; reworded as 0b997eb7ceee
|
o dd800401bd8c
|
| x 9bd10a0775e4
- |/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
+ |/ Obsfate: split as 4a004186e638, ba2ed02b0c9a, dd800401bd8c
|
o f897c6137566
|
| x 0dec01379d3b
- | | Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c
+ | | Obsfate: rewritten as f897c6137566; rewritten as 471f378eab4c
| |
| x 471f378eab4c
- |/ Obsfate: rewritten as 2:0dec01379d3b
+ |/ Obsfate: rewritten as 0dec01379d3b
|
o ea207398892e
@@ -1484,8 +1490,8 @@
| @ 9bd10a0775e4
|/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
| semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
- | Fate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc
- | Fate: split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
+ | Fate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc
+ | Fate: split as b18bc8331526, dd800401bd8c, eceed8f98ffc
|
o f897c6137566
|
@@ -1501,7 +1507,7 @@
o dd800401bd8c
|
| @ 9bd10a0775e4
- |/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
+ |/ Obsfate: split as 0b997eb7ceee, dd800401bd8c, eceed8f98ffc; split as b18bc8331526, dd800401bd8c, eceed8f98ffc
|
o f897c6137566
|
@@ -1531,13 +1537,13 @@
(use 'hg evolve' to update to its parent successor)
$ hg tlog
@ 471f378eab4c
- | Fate: pruned using prune
+ | Fate: pruned
|
o ea207398892e
$ hg fatelog -v
@ 471f378eab4c
- | Obsfate: pruned using prune by test (at 1970-01-01 00:00 +0000)
+ | Obsfate: pruned by test (at 1970-01-01 00:00 +0000)
|
o ea207398892e
--- a/tests/test-evolve-topic.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve-topic.t Thu Oct 25 16:33:10 2018 +0200
@@ -89,16 +89,16 @@
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo ddd >> ddd
$ hg amend
- 6 new orphan changesets
+ 6 new unstable changesets
$ hg up 'desc(fff)'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo fff >> fff
$ hg amend
$ hg log -G
- @ 11 - {foo} e104f49bab28 add fff (draft)
+ @ 13 - {foo} e104f49bab28 add fff (draft)
|
- | o 10 - {foo} d9cacd156ffc add ddd (draft)
+ | o 11 - {foo} d9cacd156ffc add ddd (draft)
| |
| | o 9 - {bar} 1d964213b023 add jjj (draft)
| | |
@@ -138,11 +138,11 @@
move:[s4] add fff
working directory is now at 070c5573d8f9
$ hg log -G
- @ 13 - {foo} 070c5573d8f9 add fff (draft)
+ @ 15 - {foo} 070c5573d8f9 add fff (draft)
|
- o 12 - {foo} 42b49017ff90 add eee (draft)
+ o 14 - {foo} 42b49017ff90 add eee (draft)
|
- o 10 - {foo} d9cacd156ffc add ddd (draft)
+ o 11 - {foo} d9cacd156ffc add ddd (draft)
|
| o 9 - {bar} 1d964213b023 add jjj (draft)
| |
@@ -170,25 +170,25 @@
$ hg evolve --rev 'topic(bar)'
move:[6] add ggg
- atop:[13] add fff
+ atop:[15] add fff
move:[7] add hhh
move:[8] add iii
move:[9] add jjj
working directory is now at 9bf430c106b7
$ hg log -G
- @ 17 - {bar} 9bf430c106b7 add jjj (draft)
+ @ 19 - {bar} 9bf430c106b7 add jjj (draft)
|
- o 16 - {bar} d2dc89c57700 add iii (draft)
+ o 18 - {bar} d2dc89c57700 add iii (draft)
|
- o 15 - {bar} 20bc4d02aa62 add hhh (draft)
+ o 17 - {bar} 20bc4d02aa62 add hhh (draft)
|
- o 14 - {bar} 16d6f664b17c add ggg (draft)
+ o 16 - {bar} 16d6f664b17c add ggg (draft)
|
- o 13 - {foo} 070c5573d8f9 add fff (draft)
+ o 15 - {foo} 070c5573d8f9 add fff (draft)
|
- o 12 - {foo} 42b49017ff90 add eee (draft)
+ o 14 - {foo} 42b49017ff90 add eee (draft)
|
- o 10 - {foo} d9cacd156ffc add ddd (draft)
+ o 11 - {foo} d9cacd156ffc add ddd (draft)
|
o 2 - {foo} cced9bac76e3 add ccc (draft)
|
@@ -218,7 +218,7 @@
$ hg next --no-topic
switching to topic bar
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- [14] add ggg
+ [16] add ggg
$ hg prev
preserving the current topic 'bar'
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -230,24 +230,24 @@
$ hg prev --no-topic
switching to topic foo
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- [12] add eee
+ [14] add eee
Testing when instability is involved
$ hg log -G
- o 17 - {bar} 9bf430c106b7 add jjj (draft)
+ o 19 - {bar} 9bf430c106b7 add jjj (draft)
|
- o 16 - {bar} d2dc89c57700 add iii (draft)
+ o 18 - {bar} d2dc89c57700 add iii (draft)
|
- o 15 - {bar} 20bc4d02aa62 add hhh (draft)
+ o 17 - {bar} 20bc4d02aa62 add hhh (draft)
|
- o 14 - {bar} 16d6f664b17c add ggg (draft)
+ o 16 - {bar} 16d6f664b17c add ggg (draft)
|
- o 13 - {foo} 070c5573d8f9 add fff (draft)
+ o 15 - {foo} 070c5573d8f9 add fff (draft)
|
- @ 12 - {foo} 42b49017ff90 add eee (draft)
+ @ 14 - {foo} 42b49017ff90 add eee (draft)
|
- o 10 - {foo} d9cacd156ffc add ddd (draft)
+ o 11 - {foo} d9cacd156ffc add ddd (draft)
|
o 2 - {foo} cced9bac76e3 add ccc (draft)
|
@@ -279,21 +279,21 @@
------------------------------------------------------------------------------
$ hg log --graph
- @ 18 - {bar} 793eb6370b2d add fff (draft)
+ @ 20 - {bar} 793eb6370b2d add fff (draft)
|
- | o 17 - {bar} 9bf430c106b7 add jjj (draft)
+ | o 19 - {bar} 9bf430c106b7 add jjj (draft)
| |
- | o 16 - {bar} d2dc89c57700 add iii (draft)
+ | o 18 - {bar} d2dc89c57700 add iii (draft)
| |
- | o 15 - {bar} 20bc4d02aa62 add hhh (draft)
+ | o 17 - {bar} 20bc4d02aa62 add hhh (draft)
| |
- | o 14 - {bar} 16d6f664b17c add ggg (draft)
+ | o 16 - {bar} 16d6f664b17c add ggg (draft)
| |
- | x 13 - {foo} 070c5573d8f9 add fff (draft)
+ | x 15 - {foo} 070c5573d8f9 add fff (draft)
|/
- o 12 - {foo} 42b49017ff90 add eee (draft)
+ o 14 - {foo} 42b49017ff90 add eee (draft)
|
- o 10 - {foo} d9cacd156ffc add ddd (draft)
+ o 11 - {foo} d9cacd156ffc add ddd (draft)
|
o 2 - {foo} cced9bac76e3 add ccc (draft)
|
@@ -317,15 +317,21 @@
working directory parent is obsolete! (20bc4d02aa62)
(use 'hg evolve' to update to its successor: d834582d9ee3)
$ hg log -Gr 14::
- o 19 - {bar} d834582d9ee3 add hhh (draft)
+ o 22 - {bar} d834582d9ee3 add hhh (draft)
|
- | o 17 - {bar} 9bf430c106b7 add jjj (draft)
+ | o 20 - {bar} 793eb6370b2d add fff (draft)
| |
- | o 16 - {bar} d2dc89c57700 add iii (draft)
+ | | o 19 - {bar} 9bf430c106b7 add jjj (draft)
+ | | |
+ | | o 18 - {bar} d2dc89c57700 add iii (draft)
+ | | |
+ +---@ 17 - {bar} 20bc4d02aa62 add hhh (draft)
| |
- | @ 15 - {bar} 20bc4d02aa62 add hhh (draft)
+ o | 16 - {bar} 16d6f664b17c add ggg (draft)
+ | |
+ x | 15 - {foo} 070c5573d8f9 add fff (draft)
|/
- o 14 - {bar} 16d6f664b17c add ggg (draft)
+ o 14 - {foo} 42b49017ff90 add eee (draft)
|
~
@@ -337,22 +343,22 @@
different topic
$ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase=
- rebasing 16:d2dc89c57700 "add iii" (bar)
- rebasing 17:9bf430c106b7 "add jjj" (bar)
+ rebasing 18:d2dc89c57700 "add iii"
+ rebasing 19:9bf430c106b7 "add jjj"
$ hg log -Gr 42b49017ff90::
- o 21 - {bar} 7542e76aba2c add jjj (draft)
+ o 24 - {bar} 7542e76aba2c add jjj (draft)
|
- o 20 - {bar} 7858bd7e9906 add iii (draft)
+ o 23 - {bar} 7858bd7e9906 add iii (draft)
|
- o 19 - {bar} d834582d9ee3 add hhh (draft)
+ o 22 - {bar} d834582d9ee3 add hhh (draft)
|
- | o 18 - {bar} 793eb6370b2d add fff (draft)
+ | o 20 - {bar} 793eb6370b2d add fff (draft)
| |
- @ | 14 - {bar} 16d6f664b17c add ggg (draft)
+ @ | 16 - {bar} 16d6f664b17c add ggg (draft)
| |
- x | 13 - {foo} 070c5573d8f9 add fff (draft)
+ x | 15 - {foo} 070c5573d8f9 add fff (draft)
|/
- o 12 - {foo} 42b49017ff90 add eee (draft)
+ o 14 - {foo} 42b49017ff90 add eee (draft)
|
~
--- a/tests/test-evolve.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-evolve.t Thu Oct 25 16:33:10 2018 +0200
@@ -327,7 +327,7 @@
changeset plus the updating changeset are hidden from view by default::
$ hg log
- 3 feature-B: another feature (child of 568a468b60fc) - test
+ 4 feature-B: another feature (child of 568a468b60fc) - test
1 feature-A: a nifty feature - test
0 : base - test
@@ -344,18 +344,22 @@
(amend of on ancestors)
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg log
- 4 feature-A: a nifty feature - test
- 3 feature-B: another feature (child of 568a468b60fc) - test
+ 6 feature-A: a nifty feature - test
+ 4 feature-B: another feature (child of 568a468b60fc) - test
1 : a nifty feature - test
0 : base - test
$ hg up -q 0
$ glog --hidden
- o 4:ba0ec09b1bab@default(draft) a nifty feature
+ o 6:ba0ec09b1bab@default(draft) a nifty feature
|
- | o 3:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
+ | x 5:c296b79833d1@default(draft) temporary amend commit for 568a468b60fc
| |
+ | | o 4:6992c59c6b06@default(draft) another feature (child of 568a468b60fc)
+ | |/
+ | | x 3:c97947cdc7a2@default(draft) temporary amend commit for 73296a82292a
+ | | |
| | x 2:73296a82292a@default(draft) another feature (child of 568a468b60fc)
| |/
| x 1:568a468b60fc@default(draft) a nifty feature
@@ -363,16 +367,18 @@
@ 0:e55e0562ee93@default(public) base
$ hg debugobsolete
- 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
- 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+ 73296a82292a76fb8a7061969d2489ec0d84cd5e 6992c59c6b06a1b4a92e24ff884829ae026d018b 0 (*) {'ef1': '8', 'user': 'test'} (glob)
+ c97947cdc7a2a11cf78419f5c2c3dd3944ec79e8 0 {73296a82292a76fb8a7061969d2489ec0d84cd5e} (*) {'ef1': '0', 'user': 'test'} (glob)
+ 568a468b60fc99a42d5d4ddbe181caff1eef308d ba0ec09b1babf3489b567853807f452edd46704f 0 (*) {'ef1': '8', 'user': 'test'} (glob)
+ c296b79833d1d497f33144786174bf35e04e44a3 0 {568a468b60fc99a42d5d4ddbe181caff1eef308d} (*) {'ef1': '0', 'user': 'test'} (glob)
$ hg evolve
- move:[3] another feature (child of 568a468b60fc)
- atop:[4] a nifty feature
+ move:[4] another feature (child of 568a468b60fc)
+ atop:[6] a nifty feature
merging main-file-1
working directory is now at 99833d22b0c6
$ hg log
- 5 feature-B: another feature (child of ba0ec09b1bab) - test
- 4 feature-A: a nifty feature - test
+ 7 feature-B: another feature (child of ba0ec09b1bab) - test
+ 6 feature-A: a nifty feature - test
0 : base - test
Test commit -o options
@@ -383,46 +389,46 @@
adding file-from-B
reverting main-file-1
$ sed -i'' -e s/Zwei/deux/ main-file-1
- $ hg commit -m 'another feature that rox' -o 5
+ $ hg commit -m 'another feature that rox' -o 7
created new head
$ hg log
- 6 feature-B: another feature that rox - test
- 4 feature-A: a nifty feature - test
+ 8 feature-B: another feature that rox - test
+ 6 feature-A: a nifty feature - test
0 : base - test
phase change turning obsolete changeset public issue a bumped warning
$ hg phase --hidden --public 99833d22b0c6
- 1 new phase-divergent changesets
+ 1 new bumped changesets
all solving bumped troubled
- $ glog
- @ 6:47d52a103155@default(draft) another feature that rox
+ $ hg log -G
+ @ 8 feature-B: another feature that rox - test
|
- | o 5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+ | o 7 : another feature (child of ba0ec09b1bab) - test
|/
- o 4:ba0ec09b1bab@default(public) a nifty feature
+ o 6 feature-A: a nifty feature - test
|
- o 0:e55e0562ee93@default(public) base
+ o 0 : base - test
$ hg evolve --any --traceback --phase-divergent
- recreate:[6] another feature that rox
- atop:[5] another feature (child of ba0ec09b1bab)
+ recreate:[8] another feature that rox
+ atop:[7] another feature (child of ba0ec09b1bab)
computing new diff
- committed as aca219761afb
- working directory is now at aca219761afb
- $ glog
- @ 7:aca219761afb@default(draft) phase-divergent update to 99833d22b0c6:
+ committed as 6707c5e1c49d
+ working directory is now at 6707c5e1c49d
+ $ hg log -G
+ @ 9 feature-B: bumped update to 99833d22b0c6: - test
|
- o 5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+ o 7 : another feature (child of ba0ec09b1bab) - test
|
- o 4:ba0ec09b1bab@default(public) a nifty feature
+ o 6 feature-A: a nifty feature - test
|
- o 0:e55e0562ee93@default(public) base
+ o 0 : base - test
- $ hg diff --hidden -r aca219761afb -r 47d52a103155
- $ hg diff -r aca219761afb^ -r aca219761afb
+ $ hg diff --hidden -r 6707c5e1c49d -r 47d52a103155
+ $ hg diff -r 6707c5e1c49d^ -r 6707c5e1c49d
diff --git a/main-file-1 b/main-file-1
--- a/main-file-1
+++ b/main-file-1
@@ -436,26 +442,26 @@
$ hg commit -m 'dansk 2!'
$ sed -i'' -e s/Three/tre/ main-file-1
$ hg commit -m 'dansk 3!'
- $ hg update aca219761afb
+ $ hg update 6707c5e1c49d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ sed -i'' -e s/Un/Én/ main-file-1
$ hg commit --amend -m 'dansk!'
- 2 new orphan changesets
+ 2 new unstable changesets
(ninja test for the {trouble} template:
$ hg log -G --template '{rev} {troubles}\n'
- @ 10
+ @ 13
|
- | o 9 orphan
+ | o 11 orphan
| |
- | o 8 orphan
+ | o 10 orphan
| |
- | x 7
+ | x 9
|/
- o 5
+ o 7
|
- o 4
+ o 6
|
o 0
@@ -464,22 +470,22 @@
(/ninja)
$ hg evolve --all --traceback
- move:[8] dansk 2!
- atop:[10] dansk!
+ move:[10] dansk 2!
+ atop:[13] dansk!
merging main-file-1
- move:[9] dansk 3!
+ move:[11] dansk 3!
merging main-file-1
- working directory is now at 96abb1319a47
+ working directory is now at 68557e4f0048
$ hg log -G
- @ 12 : dansk 3! - test
+ @ 15 : dansk 3! - test
|
- o 11 : dansk 2! - test
+ o 14 : dansk 2! - test
|
- o 10 feature-B: dansk! - test
+ o 13 feature-B: dansk! - test
|
- o 5 : another feature (child of ba0ec09b1bab) - test
+ o 7 : another feature (child of ba0ec09b1bab) - test
|
- o 4 feature-A: a nifty feature - test
+ o 6 feature-A: a nifty feature - test
|
o 0 : base - test
@@ -507,7 +513,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 702e4d0a6d86
$ cd alpha
$ cat << EOF > A
@@ -540,13 +545,13 @@
checking manifests
crosschecking files in changesets and manifests
checking files
- 3 files, 3 changesets, 3 total revisions
+ 3 files, 4 changesets, 4 total revisions
$ hg --config extensions.hgext.mq= strip 'extinct()'
abort: empty revision set
[255]
(do some garbare collection)
$ hg --config extensions.hgext.mq= strip --hidden 'extinct()' --config devel.strip-obsmarkers=no
- saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-a365b072-backup.hg (glob)
+ saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-d7bd82e9-backup.hg (glob)
$ hg verify
checking changesets
checking manifests
@@ -565,8 +570,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 1 new obsolescence markers
- new changesets c6dda801837c
+ 2 new obsolescence markers
(run 'hg update' to get a working copy)
$ hg up
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -617,8 +621,8 @@
o 0:8685c6d34325@default(draft) add 0
$ hg debugobsolete
- 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'pick', 'user': 'test'}
- db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
+ 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
+ db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
Test grab --continue
@@ -660,9 +664,9 @@
o 0:8685c6d34325@default(draft) add 0
$ hg debugobsolete
- 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'pick', 'user': 'test'}
- db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
- a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 fb2c0f0a0c54be4367988521bad2cbd33a540969 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'pick', 'user': 'test'}
+ 0e84df4912da4c7cad22a3b4fcfd58ddfb7c8ae9 fa455b5098e0ce8c1871edf6369f32be7d8b4d1c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
+ db038628b9e56f51a454c0da0c508df247b41748 417185465d2c68e575cff4cd6ed8a4047505ef24 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
+ a5bfd90a2f29c7ccb8f917ff4e5013a9053d0a04 fb2c0f0a0c54be4367988521bad2cbd33a540969 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'user': 'test'}
Test touch
@@ -765,10 +769,10 @@
@ d26d339c513f (12) add 4
|\
x | ce341209337f (4) add 4
- / rewritten(description, user, content) as d26d339c513f using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+ / rewritten(description, user, content) as d26d339c513f 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)
+ |\ rewritten(description, user, parent, content) as d26d339c513f by test (Thu Jan 01 00:00:00 1970 +0000)
| |
| \
| |\
@@ -785,19 +789,18 @@
more than 2 successors: 0
available keys:
ef1: 10
- operation: 10
user: 10
marker size:
format v1:
- smallest length: 90
- longer length: 92
- median length: 91
- mean length: 90
- format v0:
smallest length: * (glob)
longer length: * (glob)
median length: * (glob)
mean length: * (glob)
+ format v0:
+ smallest length: 72
+ longer length: 73
+ median length: 73
+ mean length: 72
disconnected clusters: 1
any known node: 1
smallest length: 10
@@ -827,7 +830,7 @@
$ hg ci -m c
$ hg prune .^
1 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg stab --any
move:[15] c
atop:[13] a
@@ -844,13 +847,13 @@
2 changesets folded
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ glog
- @ 13:284c0d45770d@default(draft) Folding with custom commit message
+ @ 16:98cb758db56d@default(draft) Folding with custom commit message
|
- o 10:9975c016fe7b@default(draft) dansk!
+ o 13:0a2f9b959bb4@default(draft) dansk!
|
- o 5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+ o 7:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
|
- o 4:ba0ec09b1bab@default(public) a nifty feature
+ o 6:ba0ec09b1bab@default(public) a nifty feature
|
o 0:e55e0562ee93@default(public) base
@@ -863,10 +866,10 @@
2 changesets folded
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg qlog
- 14 - 8693d0f277b8 A longer
+ 17 - a00182c58888 A longer
commit message (draft)
- 5 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
- 4 - ba0ec09b1bab a nifty feature (public)
+ 7 - 99833d22b0c6 another feature (child of ba0ec09b1bab) (public)
+ 6 - ba0ec09b1bab a nifty feature (public)
0 - e55e0562ee93 base (public)
$ cd ..
@@ -904,17 +907,17 @@
marked working directory as branch mybranch
(branches are permanent and global, did you want a bookmark?)
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg evolve
move:[3] a3
- atop:[4] a2
+ atop:[5] a2
working directory is now at 7c5649f73d11
$ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
- @ 5 [mybranch] a3
+ @ 6 [mybranch] a3
|
- o 4 [mybranch] a2
+ o 5 [mybranch] a2
|
o 1 [default] a1
|
@@ -926,21 +929,21 @@
$ hg up 'desc(a1)'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg amend -m 'a1_'
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg evolve
- move:[4] a2
- atop:[6] a1_
+ move:[5] a2
+ atop:[7] a1_
working directory is now at eb07e22a0e63
$ hg evolve
- move:[5] a3
- atop:[7] a2
+ move:[6] a3
+ atop:[8] a2
working directory is now at 777c26ca5e78
$ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
- @ 8 [mybranch] a3
+ @ 9 [mybranch] a3
|
- o 7 [mybranch] a2
+ o 8 [mybranch] a2
|
- o 6 [default] a1_
+ o 7 [default] a1_
|
o 0 [default] a0
@@ -950,18 +953,18 @@
$ hg up -r "desc('a1_')"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg ci --amend -m 'a1__'
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg up -r "desc('a2')"
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
- o 9 [default] a1__
+ o 10 [default] a1__
|
- | o 8 [mybranch] a3
+ | o 9 [mybranch] a3
| |
- | @ 7 [mybranch] a2
+ | @ 8 [mybranch] a2
| |
- | x 6 [default] a1_
+ | x 7 [default] a1_
|/
o 0 [default] a0
@@ -980,22 +983,22 @@
.hg/bookmarks
.hg/bookmarks.* (glob)
$ hg evolve
- move:[7] a2
- atop:[9] a1__
+ move:[8] a2
+ atop:[10] a1__
(leaving bookmark testbookmark)
working directory is now at d952e93add6f
$ ls .hg/bookmarks*
.hg/bookmarks
$ glog
- @ 10:d952e93add6f@mybranch(draft) a2
+ @ 11:d952e93add6f@mybranch(draft) a2
|
- o 9:9f8b83c2e7f3@default(draft) a1__
+ o 10:9f8b83c2e7f3@default(draft) a1__
|
- | o 8:777c26ca5e78@mybranch(draft) a3
+ | o 9:777c26ca5e78@mybranch(draft) a3
| |
- | x 7:eb07e22a0e63@mybranch(draft) a2
+ | x 8:eb07e22a0e63@mybranch(draft) a2
| |
- | x 6:faafc6cea0ba@default(draft) a1_
+ | x 7:faafc6cea0ba@default(draft) a1_
|/
o 0:07c1c36d9ef0@default(draft) a0
@@ -1007,35 +1010,35 @@
$ hg revert -r d952e93add6f --all
reverting a
$ hg log -G --template '{rev} [{branch}] {desc|firstline}\n'
- o 10 [mybranch] a2
+ o 11 [mybranch] a2
|
- @ 9 [default] a1__
+ @ 10 [default] a1__
|
- | o 8 [mybranch] a3
+ | o 9 [mybranch] a3
| |
- | x 7 [mybranch] a2
+ | x 8 [mybranch] a2
| |
- | x 6 [default] a1_
+ | x 7 [default] a1_
|/
o 0 [default] a0
$ echo "hello world" > newfile
$ hg add newfile
- $ hg commit -m "add new file bumped" -o 10
+ $ hg commit -m "add new file bumped" -o 11
$ hg phase --public --hidden d952e93add6f
- 1 new phase-divergent changesets
+ 1 new bumped changesets
$ hg log -G
- @ 11 : add new file bumped - test
+ @ 12 : add new file bumped - test
|
- | o 10 : a2 - test
+ | o 11 : a2 - test
|/
- o 9 testbookmark: a1__ - test
+ o 10 testbookmark: a1__ - test
|
- | o 8 : a3 - test
+ | o 9 : a3 - test
| |
- | x 7 : a2 - test
+ | x 8 : a2 - test
| |
- | x 6 : a1_ - test
+ | x 7 : a1_ - test
|/
o 0 : a0 - test
@@ -1044,117 +1047,105 @@
normally the unstable changeset would be solve first
$ hg log -G
- @ 11 : add new file bumped - test
+ @ 12 : add new file bumped - test
|
- | o 10 : a2 - test
+ | o 11 : a2 - test
|/
- o 9 testbookmark: a1__ - test
+ o 10 testbookmark: a1__ - test
|
- | o 8 : a3 - test
+ | o 9 : a3 - test
| |
- | x 7 : a2 - test
+ | x 8 : a2 - test
| |
- | x 6 : a1_ - test
+ | x 7 : a1_ - test
|/
o 0 : a0 - test
$ hg evolve -r "desc('add new file bumped')" --phase-divergent
- recreate:[11] add new file bumped
- atop:[10] a2
+ recreate:[12] add new file bumped
+ atop:[11] a2
computing new diff
- committed as a8bb31d4b7f2
- working directory is now at a8bb31d4b7f2
+ committed as f15d32934071
+ working directory is now at f15d32934071
$ hg evolve --any
- move:[8] a3
- atop:[12] phase-divergent update to d952e93add6f:
- working directory is now at b88539ad24d7
- $ glog
- @ 13:b88539ad24d7@default(draft) a3
- |
- o 12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
- |
- o 10:d952e93add6f@mybranch(public) a2
- |
- o 9:9f8b83c2e7f3@default(public) a1__
- |
- o 0:07c1c36d9ef0@default(public) a0
-
-
+ move:[9] a3
+ atop:[13] bumped update to d952e93add6f:
+ working directory is now at cce26b684bfe
Check that we can resolve troubles in a revset with more than one commit
- $ hg up b88539ad24d7 -C
+ $ hg up cce26b684bfe -C
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ mkcommit gg
- $ hg up b88539ad24d7
+ $ hg up cce26b684bfe
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit gh
created new head
- $ hg up b88539ad24d7
+ $ hg up cce26b684bfe
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ printf "newline\nnewline\n" >> a
$ hg log -G
- o 15 : add gh - test
+ o 16 : add gh - test
|
- | o 14 : add gg - test
+ | o 15 : add gg - test
|/
- @ 13 : a3 - test
+ @ 14 : a3 - test
|
- o 12 : phase-divergent update to d952e93add6f: - test
+ o 13 : bumped update to d952e93add6f: - test
|
- o 10 : a2 - test
+ o 11 : a2 - test
|
- o 9 testbookmark: a1__ - test
+ o 10 testbookmark: a1__ - test
|
o 0 : a0 - test
$ hg amend
- 2 new orphan changesets
- $ glog
- @ 16:0cf3707e8971@default(draft) a3
+ 2 new unstable changesets
+ $ hg log -G
+ @ 18 : a3 - test
|
- | o 15:daa1ff1c7fbd@default(draft) add gh
+ | o 16 : add gh - test
| |
- | | o 14:484fb3cfa7f2@default(draft) add gg
+ | | o 15 : add gg - test
| |/
- | x 13:b88539ad24d7@default(draft) a3
+ | x 14 : a3 - test
|/
- o 12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
+ o 13 : bumped update to d952e93add6f: - test
|
- o 10:d952e93add6f@mybranch(public) a2
+ o 11 : a2 - test
|
- o 9:9f8b83c2e7f3@default(public) a1__
+ o 10 testbookmark: a1__ - test
|
- o 0:07c1c36d9ef0@default(public) a0
+ o 0 : a0 - test
Evolving an empty revset should do nothing
- $ hg evolve --rev "daa1ff1c7fbd and 484fb3cfa7f2"
+ $ hg evolve --rev "beb41503aa3e and 27247fcb2df6"
set of specified revisions is empty
[1]
- $ hg evolve --rev "b88539ad24d7::" --phase-divergent
+ $ hg evolve --rev "cce26b684bfe::" --phase-divergent
no phasedivergent changesets in specified revisions
(do you want to use --orphan)
[2]
- $ hg evolve --rev "b88539ad24d7::" --orphan
- move:[14] add gg
- atop:[16] a3
- move:[15] add gh
- atop:[16] a3
- working directory is now at 0c049e4e5422
- $ glog
- @ 18:0c049e4e5422@default(draft) add gh
+ $ hg evolve --rev "cce26b684bfe::" --orphan
+ move:[15] add gg
+ atop:[18] a3
+ move:[16] add gh
+ atop:[18] a3
+ working directory is now at e02107f98737
+ $ hg log -G
+ @ 20 : add gh - test
|
- | o 17:98e171e2f272@default(draft) add gg
+ | o 19 : add gg - test
|/
- o 16:0cf3707e8971@default(draft) a3
+ o 18 : a3 - test
|
- o 12:a8bb31d4b7f2@default(draft) phase-divergent update to d952e93add6f:
+ o 13 : bumped update to d952e93add6f: - test
|
- o 10:d952e93add6f@mybranch(public) a2
+ o 11 : a2 - test
|
- o 9:9f8b83c2e7f3@default(public) a1__
+ o 10 testbookmark: a1__ - test
|
- o 0:07c1c36d9ef0@default(public) a0
+ o 0 : a0 - test
Enabling commands selectively, no command enabled, next and fold and unknown
$ cat >> $HGRCPATH <<EOF
@@ -1253,16 +1244,16 @@
Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
$ hg --hidden up 14
- 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
- working directory parent is obsolete! (484fb3cfa7f2)
+ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ working directory parent is obsolete! (cce26b684bfe)
$ cat >> $HGRCPATH <<EOF
> [experimental]
> evolutioncommands=evolve
> EOF
$ hg --hidden up 15
- 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
- working directory parent is obsolete! (daa1ff1c7fbd)
- (use 'hg evolve' to update to its successor: 0c049e4e5422)
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ working directory parent is obsolete! (27247fcb2df6)
+ (use 'hg evolve' to update to its successor: 24e63b319adf)
Restore all of the evolution features
@@ -1272,8 +1263,8 @@
> EOF
Check hg evolve --rev on singled out commit
- $ hg up 98e171e2f272 -C
- 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ hg up 24e63b319adf -C
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ mkcommit j1
$ mkcommit j2
$ mkcommit j3
@@ -1282,29 +1273,29 @@
$ echo "hello" > j4
$ hg add j4
$ hg amend
- 2 new orphan changesets
- $ glog -r "0cf3707e8971::"
- @ 22:274b6cd0c101@default(draft) add j1
+ 2 new unstable changesets
+ $ glog -r "edc3c9de504e::"
+ @ 25:8dc373be86d9@default(draft) add j1
|
- | o 21:89e4f7e8feb5@default(draft) add j3
+ | o 23:d7eadcf6eccd@default(draft) add j3
| |
- | o 20:4cd61236beca@default(draft) add j2
+ | o 22:2223ea564144@default(draft) add j2
| |
- | x 19:0fd8bfb02de4@default(draft) add j1
+ | x 21:48490698b269@default(draft) add j1
|/
- | o 18:0c049e4e5422@default(draft) add gh
+ | o 20:e02107f98737@default(draft) add gh
| |
- o | 17:98e171e2f272@default(draft) add gg
+ o | 19:24e63b319adf@default(draft) add gg
|/
- o 16:0cf3707e8971@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
- $ hg evolve --rev 89e4f7e8feb5 --any
+ $ hg evolve --rev d7eadcf6eccd --any
abort: cannot specify both "--rev" and "--any"
[255]
- $ hg evolve --rev 89e4f7e8feb5
- cannot solve instability of 89e4f7e8feb5, skipping
+ $ hg evolve --rev d7eadcf6eccd
+ cannot solve instability of d7eadcf6eccd, skipping
Check that uncommit respects the allowunstable option
With only createmarkers we can only uncommit on a head
@@ -1312,84 +1303,84 @@
> [experimental]
> evolution=createmarkers, allnewcommands
> EOF
- $ hg up 274b6cd0c101^
+ $ hg up 8dc373be86d9^
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg uncommit --all
abort: uncommit will orphan 4 descendants
(see 'hg help evolution.instability')
[255]
- $ hg up 274b6cd0c101
+ $ hg up 8dc373be86d9
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg uncommit --all
new changeset is empty
(use 'hg prune .' to remove it)
- $ glog -r "0cf3707e8971::"
- @ 23:0ef9ff75f8e2@default(draft) add j1
+ $ glog -r "edc3c9de504e::"
+ @ 26:044804d0c10d@default(draft) add j1
|
- | o 21:89e4f7e8feb5@default(draft) add j3
+ | o 23:d7eadcf6eccd@default(draft) add j3
| |
- | o 20:4cd61236beca@default(draft) add j2
+ | o 22:2223ea564144@default(draft) add j2
| |
- | x 19:0fd8bfb02de4@default(draft) add j1
+ | x 21:48490698b269@default(draft) add j1
|/
- | o 18:0c049e4e5422@default(draft) add gh
+ | o 20:e02107f98737@default(draft) add gh
| |
- o | 17:98e171e2f272@default(draft) add gg
+ o | 19:24e63b319adf@default(draft) add gg
|/
- o 16:0cf3707e8971@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
Check that prune respects the allowunstable option
$ hg up -C .
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg up 0c049e4e5422
+ $ hg up e02107f98737
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg evolve --all
nothing to evolve on current working copy parent
(2 other orphan in the repository, do you want --any or --rev)
[2]
$ hg evolve --all --any
- move:[20] add j2
- atop:[23] add j1
- move:[21] add j3
- working directory is now at 0d9203b74542
- $ glog -r "0cf3707e8971::"
- @ 25:0d9203b74542@default(draft) add j3
+ move:[22] add j2
+ atop:[26] add j1
+ move:[23] add j3
+ working directory is now at c9a20e2d74aa
+ $ glog -r "edc3c9de504e::"
+ @ 28:c9a20e2d74aa@default(draft) add j3
|
- o 24:f1b85956c48c@default(draft) add j2
+ o 27:b0e3066231e2@default(draft) add j2
|
- o 23:0ef9ff75f8e2@default(draft) add j1
+ o 26:044804d0c10d@default(draft) add j1
|
- | o 18:0c049e4e5422@default(draft) add gh
+ | o 20:e02107f98737@default(draft) add gh
| |
- o | 17:98e171e2f272@default(draft) add gg
+ o | 19:24e63b319adf@default(draft) add gg
|/
- o 16:0cf3707e8971@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
- $ hg up 98e171e2f272
+ $ hg up 19
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit c5_
created new head
- $ hg prune '0ef9ff75f8e2 + f1b85956c48c'
+ $ hg prune '044804d0c10d + b0e3066231e2'
abort: touch will orphan 1 descendants
(see 'hg help evolution.instability')
[255]
- $ hg prune '98e171e2f272::0d9203b74542'
+ $ hg prune '24e63b319adf::c9a20e2d74aa'
abort: touch will orphan 1 descendants
(see 'hg help evolution.instability')
[255]
- $ hg prune '0ef9ff75f8e2::'
+ $ hg prune '044804d0c10d::'
3 changesets pruned
- $ glog -r "0cf3707e8971::"
- @ 26:4c6f6f6d1976@default(draft) add c5_
+ $ glog -r "edc3c9de504e::"
+ @ 29:2251801b6c91@default(draft) add c5_
|
- | o 18:0c049e4e5422@default(draft) add gh
+ | o 20:e02107f98737@default(draft) add gh
| |
- o | 17:98e171e2f272@default(draft) add gg
+ o | 19:24e63b319adf@default(draft) add gg
|/
- o 16:0cf3707e8971@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
@@ -1397,24 +1388,24 @@
(most of this has been moved to test-fold.t)
- $ hg up 0cf3707e8971
+ $ hg up edc3c9de504e
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit unstableifparentisfolded
created new head
- $ glog -r "0cf3707e8971::"
- @ 27:2d1b55e10be9@default(draft) add unstableifparentisfolded
+ $ glog -r "edc3c9de504e::"
+ @ 30:68330ac625b8@default(draft) add unstableifparentisfolded
|
- | o 26:4c6f6f6d1976@default(draft) add c5_
+ | o 29:2251801b6c91@default(draft) add c5_
| |
- +---o 18:0c049e4e5422@default(draft) add gh
+ +---o 20:e02107f98737@default(draft) add gh
| |
- | o 17:98e171e2f272@default(draft) add gg
+ | o 19:24e63b319adf@default(draft) add gg
|/
- o 16:0cf3707e8971@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
- $ hg fold --exact "98e171e2f272::"
+ $ hg fold --exact "24e63b319adf::"
2 changesets folded
Check that evolve shows error while handling split commits
@@ -1425,14 +1416,14 @@
> evolution=all
> EOF
- $ glog -r "0cf3707e8971::"
- o 28:92ca6f3984de@default(draft) add gg
+ $ glog -r "edc3c9de504e::"
+ o 31:580886d07058@default(draft) add gg
|
- | @ 27:2d1b55e10be9@default(draft) add unstableifparentisfolded
+ | @ 30:68330ac625b8@default(draft) add unstableifparentisfolded
|/
- | o 18:0c049e4e5422@default(draft) add gh
+ | o 20:e02107f98737@default(draft) add gh
|/
- o 16:0cf3707e8971@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
@@ -1442,7 +1433,7 @@
$ hg add oo pp
$ hg commit -m "oo+pp"
$ mkcommit uu
- $ hg up 2d1b55e10be9
+ $ hg up 68330ac625b8
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ printf "oo" > oo;
$ hg add oo
@@ -1453,29 +1444,29 @@
$ hg commit -m "_pp"
$ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
1 changesets pruned
- 1 new orphan changesets
- $ glog -r "0cf3707e8971::"
- @ 32:c7dbf668e9d5@default(draft) _pp
+ 1 new unstable changesets
+ $ glog -r "edc3c9de504e::"
+ @ 35:7a555adf2b4a@default(draft) _pp
|
- o 31:2b5a32114b3d@default(draft) _oo
+ o 34:2be4d2d5bf34@default(draft) _oo
|
- | o 30:4d122571f3b6@default(draft) add uu
+ | o 33:53f0c003e03e@default(draft) add uu
| |
- | x 29:7da3e73df8a5@default(draft) oo+pp
+ | x 32:1bf2152f4f82@default(draft) oo+pp
|/
- | o 28:92ca6f3984de@default(draft) add gg
+ | o 31:580886d07058@default(draft) add gg
| |
- o | 27:2d1b55e10be9@default(draft) add unstableifparentisfolded
+ o | 30:68330ac625b8@default(draft) add unstableifparentisfolded
|/
- | o 18:0c049e4e5422@default(draft) add gh
+ | o 20:e02107f98737@default(draft) add gh
|/
- o 16:0cf3707e8971@default(draft) a3
+ o 18:edc3c9de504e@default(draft) a3
|
~
- $ hg evolve --rev "0cf3707e8971::"
- move:[30] add uu
- atop:[32] _pp
- working directory is now at be23044af550
+ $ hg evolve --rev "edc3c9de504e::"
+ move:[33] add uu
+ atop:[35] _pp
+ working directory is now at 43c3f5ef149f
Check that dirstate changes are kept at failure for conflicts (issue4966)
@@ -1484,7 +1475,7 @@
$ echo "will be amended" > newfile
$ hg commit -m "will be amended"
$ hg parents
- 34 : will be amended - test
+ 37 : will be amended - test
$ echo "will be evolved safely" >> a
$ hg commit -m "will be evolved safely"
@@ -1494,55 +1485,34 @@
$ hg add newlyadded
$ hg commit -m "will cause conflict at evolve"
- $ glog -r "0cf3707e8971::"
- @ 36:59c37c5bebd1@default(draft) will cause conflict at evolve
- |
- o 35:7cc12c6c7862@default(draft) will be evolved safely
- |
- o 34:98c7ab460e6b@default(draft) will be amended
- |
- o 33:be23044af550@default(draft) add uu
- |
- o 32:c7dbf668e9d5@default(draft) _pp
- |
- o 31:2b5a32114b3d@default(draft) _oo
- |
- | o 28:92ca6f3984de@default(draft) add gg
- | |
- o | 27:2d1b55e10be9@default(draft) add unstableifparentisfolded
- |/
- | o 18:0c049e4e5422@default(draft) add gh
- |/
- o 16:0cf3707e8971@default(draft) a3
- |
- ~
-
- $ hg update -q 98c7ab460e6b
+ $ hg update -q 36030b147271
$ echo "amended" > newfile
$ hg amend -m "amended"
- 2 new orphan changesets
+ 2 new unstable changesets
- $ hg evolve --rev "98c7ab460e6b::"
- move:[35] will be evolved safely
- atop:[37] amended
- move:[36] will cause conflict at evolve
+ $ hg evolve --rev "36030b147271::"
+ move:[38] will be evolved safely
+ atop:[41] amended
+ move:[39] will cause conflict at evolve
merging newfile
warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
[1]
- $ glog -r "be23044af550::" --hidden
- @ 38:61abd81de026@default(draft) will be evolved safely
+ $ glog -r "43c3f5ef149f::" --hidden
+ @ 42:c904da5245b0@default(draft) will be evolved safely
|
- o 37:df89d30f23e2@default(draft) amended
+ o 41:34ae045ec400@default(draft) amended
|
- | @ 36:59c37c5bebd1@default(draft) will cause conflict at evolve
- | |
- | x 35:7cc12c6c7862@default(draft) will be evolved safely
+ | x 40:e88bee38ffc2@default(draft) temporary amend commit for 36030b147271
| |
- | x 34:98c7ab460e6b@default(draft) will be amended
+ | | @ 39:02e943732647@default(draft) will cause conflict at evolve
+ | | |
+ | | x 38:f8e30e9317aa@default(draft) will be evolved safely
+ | |/
+ | x 37:36030b147271@default(draft) will be amended
|/
- o 33:be23044af550@default(draft) add uu
+ o 36:43c3f5ef149f@default(draft) add uu
|
~
@@ -1565,7 +1535,7 @@
$ hg amend
$ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n"
- @ 1:ab832e43dd5a added a
+ @ 2:ab832e43dd5a added a
$ hg up f7ad41964313 --hidden
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1575,12 +1545,14 @@
$ hg bookmark book
$ hg evolve
- update:[1] added a
+ update:[2] added a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at ab832e43dd5a
$ hg log -GT "{rev}:{node|short} {desc} ({bookmarks})\n" --hidden
- @ 1:ab832e43dd5a added a (book)
+ @ 2:ab832e43dd5a added a (book)
+ x 1:9d806b52d1c5 temporary amend commit for f7ad41964313 ()
+ |
x 0:f7ad41964313 added a ()
--- a/tests/test-exchange-obsmarkers-case-A1.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A1.t Thu Oct 25 16:33:10 2018 +0200
@@ -113,7 +113,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
- new changesets f5bc6836db60
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
@@ -155,7 +154,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
- new changesets f5bc6836db60
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
@@ -269,7 +267,6 @@
adding file changes
added 2 changesets with 2 changes to 2 files
1 new obsolescence markers
- new changesets f5bc6836db60:f6fbb35d8ac9
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
@@ -311,7 +308,6 @@
adding file changes
added 2 changesets with 2 changes to 2 files
1 new obsolescence markers
- new changesets f5bc6836db60:f6fbb35d8ac9
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
--- a/tests/test-exchange-obsmarkers-case-A2.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A2.t Thu Oct 25 16:33:10 2018 +0200
@@ -124,7 +124,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
- new changesets f5bc6836db60
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
--- a/tests/test-exchange-obsmarkers-case-A3.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A3.t Thu Oct 25 16:33:10 2018 +0200
@@ -145,7 +145,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
- new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
@@ -264,9 +263,8 @@
added 1 changesets with 1 changes to 1 files (+1 heads)
1 new obsolescence markers
obsoleted 1 changesets
- new changesets e5ea8f9c7314
(run 'hg heads' to see heads, 'hg merge' to merge)
- 1 new orphan changesets
+ 1 new unstable changesets
## post pull state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-A4.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A4.t Thu Oct 25 16:33:10 2018 +0200
@@ -133,7 +133,6 @@
adding file changes
added 2 changesets with 2 changes to 2 files
1 new obsolescence markers
- new changesets 28b51eb45704:06055a7959d4
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
--- a/tests/test-exchange-obsmarkers-case-A5.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A5.t Thu Oct 25 16:33:10 2018 +0200
@@ -141,7 +141,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
- new changesets f6298a8ac3a4
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
--- a/tests/test-exchange-obsmarkers-case-B1.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-B1.t Thu Oct 25 16:33:10 2018 +0200
@@ -70,18 +70,18 @@
$ inspect_obsmarkers
obsstore content
================
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 26563406db05b110410fcfb692bd66c212f15c7a
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 8dff6be5bc7194357b78e44acc79f138eedc075a
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 8408066feeb4e37fa26d01fe5c93bea92e450608
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 535b0c799a3a273fee10934abcb9e8eb9924b4bf
obshashrange
============
rev node index size depth obshash
- 1 f5bc6836db60 0 2 2 26563406db05
+ 1 f5bc6836db60 0 2 2 8408066feeb4
0 a9bdc8b26820 0 1 1 000000000000
- 1 f5bc6836db60 1 1 2 26563406db05
+ 1 f5bc6836db60 1 1 2 8408066feeb4
$ cd ..
$ cd ..
@@ -93,7 +93,7 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -102,7 +102,7 @@
no changes found
## post push state
# obstore: main
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
@@ -110,6 +110,6 @@
no changes found
## post pull state
# obstore: main
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
--- a/tests/test-exchange-obsmarkers-case-B2.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-B2.t Thu Oct 25 16:33:10 2018 +0200
@@ -61,15 +61,15 @@
$ inspect_obsmarkers
obsstore content
================
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 74ed8e6f50691484f77e001e3b4d47bfb19e71ca
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 7ffbaf08d0e1af78bf45faaaba500e25993ee5cc
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 62d86865fd15a1e1b0ef16ebb9cb851689032dd8
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 6e3ba325674c3b035b63ec3db449ad2853a18372
obshashrange
============
rev node index size depth obshash
- 0 a9bdc8b26820 0 1 1 74ed8e6f5069
+ 0 a9bdc8b26820 0 1 1 62d86865fd15
$ cd ..
$ cd ..
@@ -84,7 +84,7 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -94,9 +94,9 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
pulling from main
@@ -104,11 +104,11 @@
1 new obsolescence markers
## post pull state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
Actual Test (bare push version)
-----------------------------------
@@ -117,7 +117,7 @@
## Running testcase B.2.b
## initial state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -127,9 +127,9 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -138,8 +138,8 @@
1 new obsolescence markers
## post pull state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-B3.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-B3.t Thu Oct 25 16:33:10 2018 +0200
@@ -72,19 +72,19 @@
$ inspect_obsmarkers
obsstore content
================
- e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
f5bc6836db60e308a17ba08bf050154ba9c4fad7 0000000000000000000000000000000000000000
- 35b1839966785d5703a01607229eea932db42f87 3bb8cd8ac8f52487f2ef21e0bdf795a5cd293351
- e56289ab6378dc752fd7965f8bf66b58bda740bd b62eedd8d9194225136e5908c492ab03569079da
+ 35b1839966785d5703a01607229eea932db42f87 d6033d6b3eb3451694dde5b6dd2356ae57eff23b
+ e56289ab6378dc752fd7965f8bf66b58bda740bd f4bc7329023b9b1f7db3b7989fd7f80a2ca7a008
obshashrange
============
rev node index size depth obshash
- 2 35b183996678 0 2 2 3bb8cd8ac8f5
+ 2 35b183996678 0 2 2 d6033d6b3eb3
1 f5bc6836db60 0 2 2 000000000000
- 2 35b183996678 1 1 2 3bb8cd8ac8f5
+ 2 35b183996678 1 1 2 d6033d6b3eb3
0 a9bdc8b26820 0 1 1 000000000000
1 f5bc6836db60 1 1 2 000000000000
$ cd ..
@@ -98,7 +98,7 @@
# testing echange of "A" (f5bc6836db60)
## initial state
# obstore: main
- e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing "A" from main to pushdest
@@ -110,7 +110,7 @@
remote: added 1 changesets with 1 changes to 1 files
## post push state
# obstore: main
- e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pulling "f5bc6836db60" from main into pulldest
@@ -120,11 +120,10 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets f5bc6836db60
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e56289ab6378dc752fd7965f8bf66b58bda740bd 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
--- a/tests/test-exchange-obsmarkers-case-B4.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-B4.t Thu Oct 25 16:33:10 2018 +0200
@@ -87,19 +87,19 @@
$ inspect_obsmarkers
obsstore content
================
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 4400aae8095ae57b6c8aec3cb0e0b1f6affa2bc1
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 f7f3228813861a85df5fd15efa052adfacbf04d5
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 3f79fbe3c760de835dc0cb8f103f639bc7bfcfe3
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 9296ff88911dfe4920e76e60c5a11054949f2fca
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 000a06f93df9cdd3c570d38aef8cd21a4a25df9b
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 ff621c458a04f2994124b0ef4b43572f7eb2335a
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 5afda6754e34bfe9ac1942df123711f929054273
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed f3513f70438639d6687bbec74f4d3fd11853f471
obshashrange
============
rev node index size depth obshash
2 f6fbb35d8ac9 0 3 3 000000000000
1 f5bc6836db60 0 2 2 000000000000
- 0 a9bdc8b26820 0 1 1 4400aae8095a
+ 0 a9bdc8b26820 0 1 1 000a06f93df9
1 f5bc6836db60 1 1 2 000000000000
2 f6fbb35d8ac9 2 1 3 000000000000
$ cd ..
@@ -116,7 +116,7 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -126,9 +126,9 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
pulling from main
@@ -136,11 +136,11 @@
1 new obsolescence markers
## post pull state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
Actual Test (bare push version)
-----------------------------------
@@ -149,7 +149,7 @@
## Running testcase B.4.b
## initial state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -159,9 +159,9 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -170,8 +170,8 @@
1 new obsolescence markers
## post pull state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-B5.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-B5.t Thu Oct 25 16:33:10 2018 +0200
@@ -94,27 +94,27 @@
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 13bd00d88332fcd3fe634ed42f9d35c9cfc06398
1d0f3cd253006f014c7687a78abbc9287db4101d 01d985a82467333a4de7a5b4e8a0de3286f8bda8
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 eb83c031f3cbab180666ee92f54f0832b9f46eaa
- 069b05c3876d56f62895e853a501ea58ea85f68d 87d03503620a7443b999bc8b8c00346f7afe7168
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 13bd4798a9a787c0b54db36e03ec580012600b50
+ 069b05c3876d56f62895e853a501ea58ea85f68d 35916a1d760564c67d3a68921fd5908f28b486c0
obshashrange
============
rev node index size depth obshash
3 1d0f3cd25300 0 4 4 000000000000
3 1d0f3cd25300 2 2 4 000000000000
1 28b51eb45704 0 2 2 000000000000
- 4 e5ea8f9c7314 0 2 2 eb83c031f3cb
+ 4 e5ea8f9c7314 0 2 2 13bd4798a9a7
3 1d0f3cd25300 3 1 4 000000000000
1 28b51eb45704 1 1 2 000000000000
2 6e72f0a95b5e 2 1 3 13bd00d88332
0 a9bdc8b26820 0 1 1 000000000000
- 4 e5ea8f9c7314 1 1 2 eb83c031f3cb
+ 4 e5ea8f9c7314 1 1 2 13bd4798a9a7
$ cd ..
$ cd ..
@@ -126,7 +126,7 @@
# testing echange of "C" (1d0f3cd25300)
## initial state
# obstore: main
- 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -142,7 +142,7 @@
remote: 1 new obsolescence markers
## post push state
# obstore: main
- 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -157,11 +157,10 @@
adding file changes
added 3 changesets with 3 changes to 3 files
1 new obsolescence markers
- new changesets 28b51eb45704:1d0f3cd25300
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 069b05c3876d56f62895e853a501ea58ea85f68d 0 {e5ea8f9c73143125d36658e90ef70c6d2027a5b7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 069b05c3876d56f62895e853a501ea58ea85f68d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-B6.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-B6.t Thu Oct 25 16:33:10 2018 +0200
@@ -72,18 +72,18 @@
obsstore content
================
962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 86c0915d87bd250d041dcb32e46789b6f859686b
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 90eb403e560458149d549c4a965c0c2b81fe0cbb
- 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b 6758dc37fbd86f9625196ba95b8b76ec8c72e73d
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 ce7933a7b712bc438ea1881c2b79c6581618245c
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 6d4265767de9c3095bc6ec62648c64610d3fe9cd
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 52260e159f886b089e44a0eb7325683e93a18a5a
+ 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b 4f5b201f1c8023e258712dcd02ca1239b41a91c4
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 8e0762e9ba2cff99bfa111d56788341de35e80b1
obshashrange
============
rev node index size depth obshash
1 f5bc6836db60 0 2 2 000000000000
- 0 a9bdc8b26820 0 1 1 86c0915d87bd
+ 0 a9bdc8b26820 0 1 1 6d4265767de9
1 f5bc6836db60 1 1 2 000000000000
$ cd ..
$ cd ..
@@ -97,7 +97,7 @@
## initial state
# obstore: main
962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -108,10 +108,10 @@
## post push state
# obstore: main
962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
pulling from main
@@ -120,11 +120,11 @@
## post pull state
# obstore: main
962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-B7.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-B7.t Thu Oct 25 16:33:10 2018 +0200
@@ -66,18 +66,18 @@
$ inspect_obsmarkers
obsstore content
================
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 26563406db05b110410fcfb692bd66c212f15c7a
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 8dff6be5bc7194357b78e44acc79f138eedc075a
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 8408066feeb4e37fa26d01fe5c93bea92e450608
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 535b0c799a3a273fee10934abcb9e8eb9924b4bf
obshashrange
============
rev node index size depth obshash
- 1 f5bc6836db60 0 2 2 26563406db05
+ 1 f5bc6836db60 0 2 2 8408066feeb4
0 a9bdc8b26820 0 1 1 000000000000
- 1 f5bc6836db60 1 1 2 26563406db05
+ 1 f5bc6836db60 1 1 2 8408066feeb4
$ cd ..
$ cd ..
@@ -89,7 +89,7 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -98,7 +98,7 @@
no changes found
## post push state
# obstore: main
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
@@ -106,6 +106,6 @@
no changes found
## post pull state
# obstore: main
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
--- a/tests/test-exchange-obsmarkers-case-C1.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-C1.t Thu Oct 25 16:33:10 2018 +0200
@@ -58,7 +58,7 @@
$ mkcommit A
$ mkcommit B
$ hg prune -qd '0 0' '.~1'
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg prune -qd '0 0' .
$ hg log -G --hidden
x f6fbb35d8ac9 (draft): B
@@ -70,17 +70,17 @@
$ inspect_obsmarkers
obsstore content
================
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 4e4b1659570cc47f1bdabfa3497e6f2d2b046ad5
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 b850046e0c6894550e08fff1bdd1e0a597767183
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af b80529986a1201fd5306200ce6a19150fad97a2a
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 2eae6a894c52a556ac692c2d0da80e81548b9f08
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 36f7fefb84e169c95144b085ce25607908f43c05
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af b5e9a0fe6060fb80fa51366d6fc5b8f3a5c6e1ed
obshashrange
============
rev node index size depth obshash
- 0 a9bdc8b26820 0 1 1 4e4b1659570c
+ 0 a9bdc8b26820 0 1 1 2eae6a894c52
$ cd ..
$ cd ..
@@ -95,8 +95,8 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -106,11 +106,11 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
pulling from main
@@ -118,14 +118,14 @@
2 new obsolescence markers
## post pull state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
Actual Test (bare push)
-------------------------------------
@@ -134,8 +134,8 @@
## Running testcase C.1.b
## initial state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -145,11 +145,11 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -158,11 +158,11 @@
2 new obsolescence markers
## post pull state
# obstore: main
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-C2.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-C2.t Thu Oct 25 16:33:10 2018 +0200
@@ -75,20 +75,20 @@
$ inspect_obsmarkers
obsstore content
================
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f cfacc7f87b22bba57fd24c3472f08d00c33ada5d
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a b5ae2ee85cbc1b157410b51cd9fe78fb5bb753cf
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 945a85093e28fbda8065db6933af09acd8d22524
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 3ef2e3b1b37e7a3a8a885b2ff08fa626f1d3aaa9
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 75187bd51740051fdf046fae67687fb056343515
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 163059af30d498e215e86e1ead6ab749521c38be
obshashrange
============
rev node index size depth obshash
- 3 e5ea8f9c7314 0 2 2 945a85093e28
+ 3 e5ea8f9c7314 0 2 2 163059af30d4
0 a9bdc8b26820 0 1 1 000000000000
- 3 e5ea8f9c7314 1 1 2 945a85093e28
+ 3 e5ea8f9c7314 1 1 2 163059af30d4
$ cd ..
$ cd ..
@@ -103,7 +103,7 @@
# testing echange of "A1" (e5ea8f9c7314)
## initial state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
# obstore: pulldest
@@ -117,10 +117,10 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pulldest
## pulling "e5ea8f9c7314" from main into pulldest
@@ -131,17 +131,16 @@
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
- new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pulldest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
Actual Test (bare push)
@@ -151,7 +150,7 @@
## Running testcase C.2.b
## initial state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
# obstore: pulldest
@@ -165,10 +164,10 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pulldest
## pulling from main into pulldest
@@ -179,15 +178,14 @@
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
- new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pulldest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-C3.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-C3.t Thu Oct 25 16:33:10 2018 +0200
@@ -78,19 +78,19 @@
$ inspect_obsmarkers
obsstore content
================
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 bb74e5d126457aac3b564438c6b80c73ea731bb6
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 86646b95e6af02c23f25660e942e19707895d905
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 5efda54c4faef1d288712649d367de614c1eb0dd
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 5ea68792a2a190fe219867808e05ef1bb23d0311
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 683625eeec1568e2bc1acd6e956de89102cea428
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f b8b53eb8289f96d4de4e2add5dd8605b4af5bab9
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 26513b68de67734af5dbfeb3b4475aa3b14ed940
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 3edacd6f3e9c4546d31990ce890315abbeb17eab
obshashrange
============
rev node index size depth obshash
- 0 a9bdc8b26820 0 1 1 bb74e5d12645
+ 0 a9bdc8b26820 0 1 1 683625eeec15
$ cd ..
$ cd ..
@@ -105,9 +105,9 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -117,13 +117,13 @@
remote: 3 new obsolescence markers
## post push state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
pulling from main
@@ -131,17 +131,17 @@
3 new obsolescence markers
## post pull state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
Actual Test (bare push)
-------------------------------------
@@ -150,9 +150,9 @@
## Running testcase C.3.b
## initial state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -162,13 +162,13 @@
remote: 3 new obsolescence markers
## post push state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -177,14 +177,14 @@
3 new obsolescence markers
## post pull state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-C4.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-C4.t Thu Oct 25 16:33:10 2018 +0200
@@ -82,19 +82,19 @@
================
f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 b1f2c573306eb5571ada89451c2593ca02f4afc6
- f5bc6836db60e308a17ba08bf050154ba9c4fad7 c83c59a98479a18fc374e728b49bc3d3645b6b60
- 35b1839966785d5703a01607229eea932db42f87 2e7cea6704fcadaf5df996b02b964a6beeacd696
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed d4deb08dfd42d62519b7e31e4a68183c937551bc
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 172c7e3f43e9982efc74a27d34bd7a54cc158b57
+ f5bc6836db60e308a17ba08bf050154ba9c4fad7 c195f40b705423f406e537d1c64f6bc131a80214
+ 35b1839966785d5703a01607229eea932db42f87 76197cf2f9c1dcf5baa6cc3f4057980055353c03
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed e0a3b65709a8a1938e6c6cfc49a45253849e31a2
obshashrange
============
rev node index size depth obshash
- 2 35b183996678 0 2 2 8a9f1f393179
+ 2 35b183996678 0 2 2 8d1b3b767a40
2 35b183996678 1 1 2 916e804c50de
- 0 a9bdc8b26820 0 1 1 b1f2c573306e
+ 0 a9bdc8b26820 0 1 1 172c7e3f43e9
$ cd ..
$ cd ..
@@ -106,7 +106,7 @@
# testing echange of "O" (a9bdc8b26820)
## initial state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
@@ -118,11 +118,11 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
@@ -131,12 +131,12 @@
2 new obsolescence markers
## post pull state
# obstore: main
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
f5bc6836db60e308a17ba08bf050154ba9c4fad7 35b1839966785d5703a01607229eea932db42f87 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pulldest
- 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
f5bc6836db60e308a17ba08bf050154ba9c4fad7 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-D1.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-D1.t Thu Oct 25 16:33:10 2018 +0200
@@ -74,17 +74,17 @@
obsstore content
================
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 945a85093e28fbda8065db6933af09acd8d22524
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 163059af30d498e215e86e1ead6ab749521c38be
obshashrange
============
rev node index size depth obshash
- 1 e5ea8f9c7314 0 2 2 945a85093e28
+ 1 e5ea8f9c7314 0 2 2 163059af30d4
0 a9bdc8b26820 0 1 1 000000000000
- 1 e5ea8f9c7314 1 1 2 945a85093e28
+ 1 e5ea8f9c7314 1 1 2 163059af30d4
$ cd ..
$ cd ..
@@ -99,7 +99,7 @@
# testing echange of "A1" (e5ea8f9c7314)
## initial state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
# obstore: pulldest
@@ -113,10 +113,10 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pulldest
## pulling "e5ea8f9c7314" from main into pulldest
@@ -127,17 +127,16 @@
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
- new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pulldest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
Actual Test (base push)
@@ -147,7 +146,7 @@
## Running testcase D.1.b
## initial state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
# obstore: pulldest
@@ -161,10 +160,10 @@
remote: 2 new obsolescence markers
## post push state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pulldest
## pulling from main into pulldest
@@ -175,16 +174,15 @@
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
- new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pushdest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
# obstore: pulldest
- 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-D2.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-D2.t Thu Oct 25 16:33:10 2018 +0200
@@ -69,15 +69,15 @@
obsstore content
================
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
- a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 2303b46c270401b6f7158dc5ea45cdfd91197f54
- 28b51eb45704506b5c603decd6bf7ac5e0f6a52f a065bd8df19ba3e3520f055e327efa86e27f7223
+ a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 c14d90ad60c950e75009151899c742ce8cc9b2e6
+ 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e08003a7b0ea2ec7ec7e07708d34cf3819aa8009
obshashrange
============
rev node index size depth obshash
- 0 a9bdc8b26820 0 1 1 2303b46c2704
+ 0 a9bdc8b26820 0 1 1 c14d90ad60c9
$ cd ..
$ cd ..
@@ -89,7 +89,7 @@
## initial state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing from main to pushdest
@@ -100,10 +100,10 @@
## post push state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
## pulling from main into pulldest
pulling from main
@@ -113,11 +113,11 @@
## post pull state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pulldest
28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
--- a/tests/test-exchange-obsmarkers-case-D3.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-D3.t Thu Oct 25 16:33:10 2018 +0200
@@ -74,17 +74,17 @@
obsstore content
================
28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
obshashtree
===========
a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
- 35b1839966785d5703a01607229eea932db42f87 d864ed12a58243aaedc35c1d065dba31aa787d4c
+ 35b1839966785d5703a01607229eea932db42f87 43ff2c20d850ad18dee0f7f252c98c1f1a0cfd5c
obshashrange
============
rev node index size depth obshash
- 2 35b183996678 0 2 2 d864ed12a582
- 2 35b183996678 1 1 2 d864ed12a582
+ 2 35b183996678 0 2 2 43ff2c20d850
+ 2 35b183996678 1 1 2 43ff2c20d850
0 a9bdc8b26820 0 1 1 000000000000
$ cd ..
$ cd ..
@@ -98,7 +98,7 @@
## initial state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pushing "O" from main to pushdest
@@ -108,7 +108,7 @@
## post push state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
## pulling "a9bdc8b26820" from main into pulldest
@@ -117,7 +117,7 @@
## post pull state
# obstore: main
28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 {35b1839966785d5703a01607229eea932db42f87} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
# obstore: pushdest
# obstore: pulldest
--- a/tests/test-exchange-obsmarkers-case-D4.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-D4.t Thu Oct 25 16:33:10 2018 +0200
@@ -140,7 +140,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
- new changesets e5ea8f9c7314
(run 'hg update' to get a working copy)
## post pull state
# obstore: main
--- a/tests/test-issue-5720.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-issue-5720.t Thu Oct 25 16:33:10 2018 +0200
@@ -45,9 +45,9 @@
[1] b
$ echo b2 > a
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg log -G -T "{rev}: {phase}"
- @ 3: draft
+ @ 4: draft
|
| o 2: secret
| |
@@ -58,7 +58,7 @@
Evolve which triggers a conflict
$ hg evolve
move:[2] c
- atop:[3] b
+ atop:[4] b
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -77,9 +77,9 @@
Tip should stay in secret phase
$ hg log -G -T "{rev}: {phase}"
- @ 4: secret
+ @ 5: secret
|
- o 3: draft
+ o 4: draft
|
o 0: draft
--- a/tests/test-metaedit.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-metaedit.t Thu Oct 25 16:33:10 2018 +0200
@@ -80,11 +80,11 @@
----
$ hg log -G
- @ 7 : F - test
+ @ 8 : F - test
|
- o 6 : E - test
+ o 7 : E - test
|
- | o 5 : D2 - test
+ | o 6 : D2 - test
|/
o 3 : C - test
|
@@ -124,10 +124,13 @@
$ hg metaedit --user foobar
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log --template '{rev}: {author}\n' -r 'desc(F):' --hidden
+ 5: test
+ 6: test
7: test
- 8: foobar
+ 8: test
+ 9: foobar
$ hg log --template '{rev}: {author}\n' -r .
- 8: foobar
+ 9: foobar
TODO: support this
$ hg metaedit '.^::.'
@@ -136,15 +139,17 @@
$ HGEDITOR=cat hg metaedit '.^::.' --fold --note 'folding changesets using metaedit,
> and newlines'
+ current hg version does not support storing note in obsmarker
abort: note cannot contain a newline
[255]
$ HGEDITOR=cat hg metaedit '.^::.' --fold --note "folding changesets using metaedit"
+ current hg version does not support storing note in obsmarker
HG: This is a fold of 2 changesets.
- HG: Commit message of changeset 6.
+ HG: Commit message of changeset 7.
E
- HG: Commit message of changeset 8.
+ HG: Commit message of changeset 9.
F
@@ -161,23 +166,23 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ glog -r .
- @ 9:a08d35fd7d9d@default(draft) E
+ @ 10:a08d35fd7d9d@default(draft) E
|
~
$ hg obslog -r .
- @ a08d35fd7d9d (9) E
+ @ a08d35fd7d9d (10) E
|\
- x | 212b2a2b87cd (8) F
- | | rewritten(description, user, parent, content) as a08d35fd7d9d using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
+ x | 212b2a2b87cd (9) F
+ | | rewritten(description, user, parent, content) as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000)
| | note: folding changesets using metaedit
| |
- | x c2bd843aa246 (6) E
- | rewritten(description, content) as a08d35fd7d9d using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
+ | x c2bd843aa246 (7) E
+ | rewritten(description, content) as a08d35fd7d9d by test (Thu Jan 01 00:00:00 1970 +0000)
| note: folding changesets using metaedit
|
- x 587528abfffe (7) F
- rewritten(user) as 212b2a2b87cd using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
+ x 587528abfffe (8) F
+ rewritten(user) as 212b2a2b87cd by test (Thu Jan 01 00:00:00 1970 +0000)
no new commit is created here because the date is the same
@@ -198,7 +203,7 @@
nothing changed
$ glog -r '.^::.'
- @ 9:a08d35fd7d9d@default(draft) E
+ @ 10:a08d35fd7d9d@default(draft) E
|
o 3:3260958f1169@default(draft) C
|
@@ -212,20 +217,20 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n'
3: C
- 10: E
+ 11: E
$ hg up .^
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg metaedit --user foobar2 tip
$ hg log --template '{rev}: {author}\n' -r "user(foobar):" --hidden
- 8: foobar
- 9: test
+ 9: foobar
10: test
- 11: foobar2
+ 11: test
+ 12: foobar2
$ hg diff -r "10" -r "11" --hidden
'fold' one commit
$ HGUSER=foobar3 hg metaedit "desc(D2)" --fold -U
1 changesets folded
$ hg log -r "tip" --template '{rev}: {author}\n'
- 12: foobar3
+ 13: foobar3
--- a/tests/test-obsconvert.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-obsconvert.t Thu Oct 25 16:33:10 2018 +0200
@@ -16,33 +16,49 @@
Test conversion between obsolete marker formats
$ hg debugobsolete
e63c23eaa88ae77967edcf4ea194d31167c478b0 b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ a5b276878fa564da042b4b9efef3713ceea20350 0 {e63c23eaa88ae77967edcf4ea194d31167c478b0} (*) {'ef1': '*', 'user': 'test'} (glob)
b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34 384fc811182687231962e486f23ea8c5bab7a2d3 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 2291082406feb57d0f83b9b0a6777b6074f3fde6 0 {b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34} (*) {'ef1': '*', 'user': 'test'} (glob)
384fc811182687231962e486f23ea8c5bab7a2d3 949d379b3c3bf051906bc3528c049cb536e2ec86 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 1616bdbe82d3fd1fb7c4e068aee277835672ffdc 0 {384fc811182687231962e486f23ea8c5bab7a2d3} (*) {'ef1': '*', 'user': 'test'} (glob)
949d379b3c3bf051906bc3528c049cb536e2ec86 f2e4c45b2a4a58ccf7ef6825b8fa5685873cd2f7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 8668d55aac650158bb510be6d47d21e3db9e5c75 0 {949d379b3c3bf051906bc3528c049cb536e2ec86} (*) {'ef1': '*', 'user': 'test'} (glob)
$ hg debugobsconvert --new-format 0
Old store is version 1, will rewrite in version 0
Done!
$ hg debugobsolete
e63c23eaa88ae77967edcf4ea194d31167c478b0 b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ a5b276878fa564da042b4b9efef3713ceea20350 0 {e63c23eaa88ae77967edcf4ea194d31167c478b0} (*) {'ef1': '*', 'user': 'test'} (glob)
b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34 384fc811182687231962e486f23ea8c5bab7a2d3 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 2291082406feb57d0f83b9b0a6777b6074f3fde6 0 {b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34} (*) {'ef1': '*', 'user': 'test'} (glob)
384fc811182687231962e486f23ea8c5bab7a2d3 949d379b3c3bf051906bc3528c049cb536e2ec86 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 1616bdbe82d3fd1fb7c4e068aee277835672ffdc 0 {384fc811182687231962e486f23ea8c5bab7a2d3} (*) {'ef1': '*', 'user': 'test'} (glob)
949d379b3c3bf051906bc3528c049cb536e2ec86 f2e4c45b2a4a58ccf7ef6825b8fa5685873cd2f7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 8668d55aac650158bb510be6d47d21e3db9e5c75 0 {949d379b3c3bf051906bc3528c049cb536e2ec86} (*) {'ef1': '*', 'user': 'test'} (glob)
$ hg debugobsconvert --new-format 0
abort: New format is the same as the old format, not upgrading!
[255]
$ hg debugobsolete
e63c23eaa88ae77967edcf4ea194d31167c478b0 b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ a5b276878fa564da042b4b9efef3713ceea20350 0 {e63c23eaa88ae77967edcf4ea194d31167c478b0} (*) {'ef1': '*', 'user': 'test'} (glob)
b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34 384fc811182687231962e486f23ea8c5bab7a2d3 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 2291082406feb57d0f83b9b0a6777b6074f3fde6 0 {b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34} (*) {'ef1': '*', 'user': 'test'} (glob)
384fc811182687231962e486f23ea8c5bab7a2d3 949d379b3c3bf051906bc3528c049cb536e2ec86 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 1616bdbe82d3fd1fb7c4e068aee277835672ffdc 0 {384fc811182687231962e486f23ea8c5bab7a2d3} (*) {'ef1': '*', 'user': 'test'} (glob)
949d379b3c3bf051906bc3528c049cb536e2ec86 f2e4c45b2a4a58ccf7ef6825b8fa5685873cd2f7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 8668d55aac650158bb510be6d47d21e3db9e5c75 0 {949d379b3c3bf051906bc3528c049cb536e2ec86} (*) {'ef1': '*', 'user': 'test'} (glob)
$ hg debugobsconvert --new-format 1
Old store is version 0, will rewrite in version 1
Done!
$ hg debugobsolete
e63c23eaa88ae77967edcf4ea194d31167c478b0 b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ a5b276878fa564da042b4b9efef3713ceea20350 0 {e63c23eaa88ae77967edcf4ea194d31167c478b0} (*) {'ef1': '*', 'user': 'test'} (glob)
b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34 384fc811182687231962e486f23ea8c5bab7a2d3 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 2291082406feb57d0f83b9b0a6777b6074f3fde6 0 {b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34} (*) {'ef1': '*', 'user': 'test'} (glob)
384fc811182687231962e486f23ea8c5bab7a2d3 949d379b3c3bf051906bc3528c049cb536e2ec86 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 1616bdbe82d3fd1fb7c4e068aee277835672ffdc 0 {384fc811182687231962e486f23ea8c5bab7a2d3} (*) {'ef1': '*', 'user': 'test'} (glob)
949d379b3c3bf051906bc3528c049cb536e2ec86 f2e4c45b2a4a58ccf7ef6825b8fa5685873cd2f7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 8668d55aac650158bb510be6d47d21e3db9e5c75 0 {949d379b3c3bf051906bc3528c049cb536e2ec86} (*) {'ef1': '*', 'user': 'test'} (glob)
Test that the default is some reasonably modern format (first downgrade)
$ hg debugobsconvert --new-format 0
@@ -53,6 +69,10 @@
Done!
$ hg debugobsolete
e63c23eaa88ae77967edcf4ea194d31167c478b0 b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ a5b276878fa564da042b4b9efef3713ceea20350 0 {e63c23eaa88ae77967edcf4ea194d31167c478b0} (*) {'ef1': '*', 'user': 'test'} (glob)
b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34 384fc811182687231962e486f23ea8c5bab7a2d3 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 2291082406feb57d0f83b9b0a6777b6074f3fde6 0 {b81ac6b9d2a55f9a7a6b90a006b1aab0568d6d34} (*) {'ef1': '*', 'user': 'test'} (glob)
384fc811182687231962e486f23ea8c5bab7a2d3 949d379b3c3bf051906bc3528c049cb536e2ec86 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 1616bdbe82d3fd1fb7c4e068aee277835672ffdc 0 {384fc811182687231962e486f23ea8c5bab7a2d3} (*) {'ef1': '*', 'user': 'test'} (glob)
949d379b3c3bf051906bc3528c049cb536e2ec86 f2e4c45b2a4a58ccf7ef6825b8fa5685873cd2f7 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 8668d55aac650158bb510be6d47d21e3db9e5c75 0 {949d379b3c3bf051906bc3528c049cb536e2ec86} (*) {'ef1': '*', 'user': 'test'} (glob)
--- a/tests/test-obsolete-push.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-obsolete-push.t Thu Oct 25 16:33:10 2018 +0200
@@ -26,7 +26,7 @@
$ hg phase --secret --force .
$ hg prune 0 1
2 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
$ glog --hidden
@ 2:244232c2222a@default(secret) C
|
@@ -56,7 +56,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files
2 new obsolescence markers
- new changesets 1994f17a630e
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd strict-publish-client
--- a/tests/test-obsolete.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-obsolete.t Thu Oct 25 16:33:10 2018 +0200
@@ -128,13 +128,13 @@
parent: 1:7c3bad9141dc
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- obsolete: rewritten as 4:725c380fe99b
+ obsolete: rewritten as 725c380fe99b
summary: add obsol_c
working directory parent is obsolete! (0d3f46688ccc)
(use 'hg evolve' to update to its successor: 725c380fe99b)
$ mkcommit d # 5 (on 3)
- 1 new orphan changesets
+ 1 new unstable changesets
$ qlog -r 'obsolete()'
3
- 0d3f46688ccc
@@ -175,7 +175,7 @@
$ hg push ../other-new
pushing to ../other-new
searching for changes
- abort: push includes orphan changeset: a7a6f2b5d8a5!
+ abort: push includes unstable changeset: a7a6f2b5d8a5!
(use 'hg evolve' to get a stable history or --force to ignore warnings)
[255]
$ hg push -f ../other-new
@@ -210,7 +210,7 @@
working directory parent is obsolete! (0d3f46688ccc)
$ mkcommit obsol_d # 6
created new head
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg debugobsolete `getid 5` `getid 6`
obsoleted 1 changesets
$ qlog
@@ -230,7 +230,7 @@
$ hg push ../other-new
pushing to ../other-new
searching for changes
- abort: push includes orphan changeset: 95de7fc6918d!
+ abort: push includes unstable changeset: 95de7fc6918d!
(use 'hg evolve' to get a stable history or --force to ignore warnings)
[255]
$ hg push ../other-new -f # use f because there is unstability
@@ -269,7 +269,7 @@
working directory parent is obsolete! (0d3f46688ccc)
$ mkcommit "obsol_d'" # 7
created new head
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg debugobsolete `getid 6` `getid 7`
obsoleted 1 changesets
$ hg pull -R ../other-new .
@@ -281,7 +281,6 @@
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
1 new obsolescence markers
obsoleted 1 changesets
- new changesets 909a0fb57e5d
(run 'hg heads' to see heads, 'hg merge' to merge)
$ qlog -R ../other-new
6
@@ -360,7 +359,7 @@
working directory parent is obsolete! (0d3f46688ccc)
$ mkcommit "obsol_d''"
created new head
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg debugobsolete `getid 7` `getid 8`
obsoleted 1 changesets
$ cd ../other-new
@@ -374,7 +373,6 @@
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
1 new obsolescence markers
obsoleted 1 changesets
- new changesets 159dfc9fa5d3
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up -q 7 # to check rollback update behavior
@@ -399,7 +397,7 @@
commit: 1 deleted, 2 unknown (clean)
update: 2 new changesets, 2 branch heads (merge)
phases: 4 draft
- orphan: 1 changesets
+ unstable: 1 changesets
$ qlog
6
- 909a0fb57e5d
@@ -522,8 +520,8 @@
#excluded 'whole rebase set is extinct and ignored.' message not in core
$ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0
rebasing 3:0d3f46688ccc "add obsol_c"
- rebasing 8:159dfc9fa5d3 "add obsol_d''"
- 2 new content-divergent changesets
+ rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip)
+ 2 new divergent changesets
$ hg --hidden log -q -r 'successors(3)'
4:725c380fe99b
10:2033b4e49474
@@ -574,7 +572,7 @@
$ cd local
$ hg phase --hidden --public 11
- 1 new phase-divergent changesets
+ 1 new bumped changesets
$ hg log -G --template='{rev} - ({phase}) {node|short} {desc}\n'
@ 12 - (draft) 6db5e282cb91 add obsol_d'''
|
@@ -594,13 +592,13 @@
parent: 10:2033b4e49474
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- instability: phase-divergent
+ trouble: bumped
summary: add obsol_d'''
$ hg push ../other-new/
pushing to ../other-new/
searching for changes
- abort: push includes phase-divergent changeset: 6db5e282cb91!
+ abort: push includes bumped changeset: 6db5e282cb91!
(use 'hg evolve' to get a stable history or --force to ignore warnings)
[255]
@@ -613,7 +611,7 @@
$ echo 42 >> f
$ hg commit --amend --traceback --quiet
$ hg log -G
- @ changeset: 14:705ab2a6b72e
+ @ changeset: 15:705ab2a6b72e
| tag: tip
| parent: 10:2033b4e49474
| user: test
@@ -624,7 +622,7 @@
|/ parent: 10:2033b4e49474
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: phase-divergent
+ | trouble: bumped
| summary: add obsol_d'''
|
| o changeset: 11:9468a5f5d8b2
@@ -662,10 +660,10 @@
909a0fb57e5d909f353d89e394ffd7e0890fec88 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1f0dee641bb7258c56bd60e93edfa2405381c41e 83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
83b5778897adafb967ef2f75be3aaa4fce49a4cc 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
- 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
+ 0d3f46688ccc6e756c7e96cf64c391c411309597 2033b4e494742365851fac84d276640cbf52833e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
+ 159dfc9fa5d334d7e03a0aecfc7f7ab4c3431fea 9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
9468a5f5d8b2c5d91e17474e95ae4791e9718fdf 6db5e282cb91df5c43ff1f1287c119ff83230d42 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
- 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+ 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
#no produced by 2.3
33d458d86621f3186c40bfccd77652f4a122743e 3734a65252e69ddcced85901647a4f335d40de1e 0 {'date': '* *', 'user': 'test'} (glob)
@@ -675,28 +673,28 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit "obsolet_conflicting_d"
$ hg summary
- parent: 15:50f11e5e3a63 tip
+ parent: 1[46]:50f11e5e3a63 tip (re)
add obsolet_conflicting_d
branch: default
commit: (clean)
update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
phases: 3 draft
- phase-divergent: 1 changesets
+ bumped: 1 changesets
$ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
$ hg log -r 'contentdivergent()'
changeset: 12:6db5e282cb91
parent: 10:2033b4e49474
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- instability: phase-divergent, content-divergent
+ trouble: bumped, divergent
summary: add obsol_d'''
- changeset: 15:50f11e5e3a63
+ changeset: 16:50f11e5e3a63
tag: tip
parent: 11:9468a5f5d8b2
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- instability: content-divergent
+ trouble: divergent
summary: add obsolet_conflicting_d
@@ -709,7 +707,7 @@
[2]
$ hg olog
@ 0d3f46688ccc (3) add obsol_c
- | rewritten(parent) as 2033b4e49474 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(parent) as 2033b4e49474 by test (Thu Jan 01 00:00:00 1970 +0000)
| rewritten as 725c380fe99b by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 4538525df7e2 (2) add c
@@ -724,46 +722,52 @@
(4538525df7e2 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
$ hg export 9468a5f5d8b2 | hg import -
applying patch from stdin
- 1 new orphan changesets
+ 1 new unstable changesets
Relevant marker computation
==============================
$ hg log -G --hidden
- @ changeset: 16:a5f7a21fe7bc
+ @ changeset: 17:a5f7a21fe7bc
| tag: tip
| parent: 2:4538525df7e2
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: orphan
+ | trouble: unstable
| summary: add obsol_d''
|
- | o changeset: 15:50f11e5e3a63
+ | o changeset: 16:50f11e5e3a63
| | parent: 11:9468a5f5d8b2
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: content-divergent
+ | | trouble: divergent
| | summary: add obsolet_conflicting_d
| |
- | | o changeset: 14:705ab2a6b72e
+ | | o changeset: 15:705ab2a6b72e
| | | parent: 10:2033b4e49474
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
| | | summary: add f
| | |
+ | | | x changeset: 14:33d458d86621
+ | | | | user: test
+ | | | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | | | obsolete: pruned
+ | | | | summary: temporary amend commit for 0b1b6dd009c0
+ | | | |
| | | x changeset: 13:0b1b6dd009c0
| | |/ parent: 10:2033b4e49474
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: amended using amend as 14:705ab2a6b72e
+ | | | obsolete: amended as 705ab2a6b72e
| | | summary: add f
| | |
| | | o changeset: 12:6db5e282cb91
| | |/ parent: 10:2033b4e49474
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | instability: phase-divergent, content-divergent
+ | | | trouble: bumped, divergent
| | | summary: add obsol_d'''
| | |
| o | changeset: 11:9468a5f5d8b2
@@ -788,29 +792,29 @@
| | | parent: 3:0d3f46688ccc
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: rebased using rebase as 11:9468a5f5d8b2
+ | | | obsolete: rebased as 9468a5f5d8b2
| | | summary: add obsol_d''
| | |
| | | x changeset: 7:909a0fb57e5d
| | |/ parent: 3:0d3f46688ccc
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: rewritten as 8:159dfc9fa5d3
+ | | | obsolete: rewritten as 159dfc9fa5d3
| | | summary: add obsol_d'
| | |
| | | x changeset: 6:95de7fc6918d
| | |/ parent: 3:0d3f46688ccc
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: rewritten as 7:909a0fb57e5d
+ | | | obsolete: rewritten as 909a0fb57e5d
| | | summary: add obsol_d
| | |
| | | x changeset: 5:a7a6f2b5d8a5
| | |/ parent: 3:0d3f46688ccc
| | | user: test
| | | date: Thu Jan 01 00:00:00 1970 +0000
- | | | obsolete: rewritten as 6:95de7fc6918d
- | | | obsolete: rewritten as 15:50f11e5e3a63
+ | | | obsolete: rewritten as 95de7fc6918d
+ | | | obsolete: rewritten as 50f11e5e3a63
| | | summary: add d
| | |
| o | changeset: 4:725c380fe99b
@@ -823,14 +827,14 @@
| |/ parent: 1:7c3bad9141dc
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | obsolete: rewritten as 4:725c380fe99b
- | | obsolete: rebased using rebase as 10:2033b4e49474
+ | | obsolete: rewritten as 725c380fe99b
+ | | obsolete: rebased as 2033b4e49474
| | summary: add obsol_c
| |
x | changeset: 2:4538525df7e2
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten as 3:0d3f46688ccc
+ | obsolete: rewritten as 0d3f46688ccc
| summary: add c
|
o changeset: 1:7c3bad9141dc
@@ -852,7 +856,8 @@
simple rewrite with a prune attached to it
$ hg debugobsolete --rev 15
- a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e 50f11e5e3a63806e678c734e525502f522d37e38 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
+ 0b1b6dd009c037985363e2290a0b579819f659db 705ab2a6b72e2cd86edb799ebe15f2695f86143e 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 33d458d86621f3186c40bfccd77652f4a122743e 0 {0b1b6dd009c037985363e2290a0b579819f659db} (*) {'ef1': '*', 'user': 'test'} (glob)
Transitive rewrite
--- a/tests/test-prev-next.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-prev-next.t Thu Oct 25 16:33:10 2018 +0200
@@ -183,7 +183,7 @@
some aspiring children
$ hg amend -m 'added b (2)'
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg next
no children
(1 unstable changesets to be evolved here, do you want --evolve?)
@@ -230,7 +230,7 @@
next with ambiguity in aspiring children
$ hg am -m 'added b (3)'
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg next
no children
(2 unstable changesets to be evolved here, do you want --evolve?)
@@ -348,7 +348,7 @@
$ sleep 1
$ hg next --evolve
waiting for lock on working directory of $TESTTMP/repo held by process '*' on host '*' (glob)
- 1 new orphan changesets
+ 1 new unstable changesets
got lock after [4-6] seconds (re)
move:[2] two
atop:[3] one
@@ -369,115 +369,10 @@
$ echo foobar > bar
$ hg add bar
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ echo babar > bar
$ hg next --evolve
abort: uncommitted changes
[255]
-
- $ cd ..
-
-Testing that `next` and `prev` respects `commands.update.check=noconflict`
-
- $ hg init noconflict
- $ cd noconflict
- $ echo "[commands]" >> .hg/hgrc
- $ echo "update.check=noconflict" >> .hg/hgrc
-
- $ echo hi > wat
- $ hg ci -Aqm "added wat"
- $ echo hi > foo
- $ hg ci -Aqm "added foo"
- $ echo hi > bar
- $ hg ci -Aqm "added bar"
-
-testing for `hg prev`
-
- $ echo bar > wat
- $ hg prev
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- [1] added foo
- $ hg diff
- diff -r cf959ce4e1ff wat
- --- a/wat Thu Jan 01 00:00:00 1970 +0000
- +++ b/wat Thu Jan 01 00:00:00 1970 +0000
- @@ -1,1 +1,1 @@
- -hi
- +bar
-
-testing for `hg next`
-
- $ hg next
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- [2] added bar
- $ hg diff
- diff -r ac3de1218820 wat
- --- a/wat Thu Jan 01 00:00:00 1970 +0000
- +++ b/wat Thu Jan 01 00:00:00 1970 +0000
- @@ -1,1 +1,1 @@
- -hi
- +bar
-
-test that we dont end up in merge conflicts
-
- $ echo bar > bar
- $ hg prev
- abort: conflicting changes
- (do you want --merge?)
- [255]
-
- $ echo hi > bar
- $ hg prev
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- [1] added foo
- $ echo bar > bar
- $ hg add bar
-
- $ hg next
- abort: conflicting changes
- (do you want --merge?)
- [255]
-
-Test that --merge still works fine with commands.update.check set
-
-XXX: yes we want --merge and we passed that!
- $ echo hi > bar
- $ echo bar >> bar
- $ hg next --merge
- merging bar
- warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
- 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
- use 'hg resolve' to retry unresolved file merges
- [2] added bar
-
- $ echo babar > bar
- $ hg resolve -m
- (no more unresolved files)
-
-Testing --merge works with other values of commands.update.check also
-
-XXX: things are broken!
- $ hg prev --merge --config commands.update.check=abort
- local [working copy] changed bar which other [destination] deleted
- use (c)hanged version, (d)elete, or leave (u)nresolved?
- 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
- use 'hg resolve' to retry unresolved file merges
- [1] added foo
-
- $ hg revert --all
- forgetting bar
- reverting wat
- $ hg resolve -m
- (no more unresolved files)
-
- $ echo bar > bar
- $ hg add bar
-
- $ hg next --merge --config commands.update.check=abort
- merging bar
- warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
- 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
- use 'hg resolve' to retry unresolved file merges
- [2] added bar
--- a/tests/test-prune.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-prune.t Thu Oct 25 16:33:10 2018 +0200
@@ -63,17 +63,17 @@
$ hg bookmark
* BABAR 3:47d2a3944de8
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'user': 'blah'}
prune leaving instability behind
$ hg prune 1
1 changesets pruned
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg book -i BABAR
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'user': 'blah'}
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
pruning multiple changeset at once
@@ -84,10 +84,10 @@
[ ui.status|working directory now at [evolve.node|1f0dee641bb7]]
[ ui.status|2 changesets pruned]
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'user': 'blah'}
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
cannot prune public changesets
@@ -96,10 +96,10 @@
(see 'hg help phases' for details)
[255]
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'user': 'blah'}
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
Check successors addition
----------------------------
@@ -145,11 +145,11 @@
working directory now at 6e8148413dd5
1 changesets pruned
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'user': 'blah'}
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
$ hg log -G
@ 12:6e8148413dd5[] (draft) add nE
|
@@ -176,12 +176,12 @@
$ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' --split
1 changesets pruned
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
- 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'user': 'blah'}
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
+ 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
$ hg log -G
@ 12:6e8148413dd5[] (draft) add nE
|
@@ -205,12 +205,12 @@
(use --pair to mark a series as a replacement for another)
[255]
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
- 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'user': 'blah'}
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
+ 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
two old, one new:
@@ -220,14 +220,14 @@
$ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nB")' --fold
2 changesets pruned
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
- 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
- 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
- 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'user': 'blah'}
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
+ 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
+ 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'user': 'test'}
+ 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
two old, two new with --pair
@@ -242,16 +242,16 @@
working directory now at 1f0dee641bb7
2 changesets pruned
$ hg debugobsolete
- 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'}
- 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
- 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
- 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
- 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
- cb7f8f706a6532967b98cf8583a81baab79a0fa7 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
- 21b6f2f1cece8c10326e575dd38239189d467190 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
+ 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'user': 'blah'}
+ 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
+ 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
+ 814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'user': 'test'}
+ 354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
+ cb7f8f706a6532967b98cf8583a81baab79a0fa7 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
+ 21b6f2f1cece8c10326e575dd38239189d467190 6e8148413dd541855b72a920a90c06fca127c7e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
test hg strip replacement
@@ -360,19 +360,18 @@
more than 2 successors: 0
available keys:
ef1: 7
- operation: 7
user: 7
marker size:
format v1:
- smallest length: 91
- longer length: 91
- median length: 91
- mean length: 91
- format v0:
smallest length: * (glob)
longer length: * (glob)
median length: * (glob)
mean length: * (glob)
+ format v0:
+ smallest length: 96
+ longer length: 96
+ median length: 96
+ mean length: 96
disconnected clusters: 7
any known node: 7
smallest length: 1
--- a/tests/test-pullbundle.t Thu Oct 25 13:05:14 2018 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1370 +0,0 @@
- $ . "$TESTDIR/testlib/pythonpath.sh"
-
- $ cat << EOF >> $HGRCPATH
- > [extensions]
- > # evolve is providing the stable range code
- > evolve=
- > pullbundle=
- > [experimental]
- > obshashrange.warm-cache=yes
- > EOF
-
-basic setup
-
- $ hg init server
- $ hg -R server debugbuilddag '.+898:branchpoint+352:mergepoint+267<branchpoint+145/mergepoint+467'
- $ hg init client
- $ hg init client2
- $ hg init client3
- $ hg init client4
-
-simple initial pull
--------------------
-
- $ hg -R server log -G -T '{rev}:{node}\n' -r '0+1234+(::1234 and (merge() or branchpoint()))'
- o 1234:f864bc82f6a2f2ecb49b83722e0895f9d657b0dd
- :
- o 898:1388f909cd2b0685efd4e2ce076d198bce20922c
- :
- o 0:1ea73414a91b0920940797d8fc6a11e447f8ea1e
-
-
- $ hg -R client pull server -r 1234 --debug --config devel.bundle2.debug=yes | grep -v 'add changeset'
- pulling from server
- query 1; heads
- pullbundle-cache: "missing" set sliced into 6 subranges in *.* seconds (glob)
- 1024 changesets found
- 128 changesets found
- 64 changesets found
- 16 changesets found
- 2 changesets found
- 1 changesets found
- listing keys for "bookmarks"
- bundle2-output-bundle: "HG20", 8 parts total
- bundle2-output: start emission of HG20 stream
- bundle2-output: bundle parameter:
- bundle2-output: start of parts
- bundle2-output: bundle part: "changegroup"
- bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
- bundle2-output: part 0: "CHANGEGROUP"
- bundle2-output: header chunk size: 44
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 1888
- bundle2-output: closing payload chunk
- bundle2-output: bundle part: "changegroup"
- bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
- bundle2-output: part 1: "CHANGEGROUP"
- bundle2-output: header chunk size: 43
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 3084
- bundle2-output: closing payload chunk
- bundle2-output: bundle part: "changegroup"
- bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
- bundle2-output: part 2: "CHANGEGROUP"
- bundle2-output: header chunk size: 42
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 4096
- bundle2-output: payload chunk size: 3596
- bundle2-output: closing payload chunk
- bundle2-output: bundle part: "changegroup"
- bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
- bundle2-output: part 3: "CHANGEGROUP"
- bundle2-output: header chunk size: 42
- bundle2-output: payload chunk size: 2956
- bundle2-output: closing payload chunk
- bundle2-output: bundle part: "changegroup"
- bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
- bundle2-output: part 4: "CHANGEGROUP"
- bundle2-output: header chunk size: 41
- bundle2-output: payload chunk size: 380
- bundle2-output: closing payload chunk
- bundle2-output: bundle part: "changegroup"
- bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
- bundle2-output: part 5: "CHANGEGROUP"
- bundle2-output: header chunk size: 41
- bundle2-output: payload chunk size: 196
- bundle2-output: closing payload chunk
- bundle2-output: bundle part: "listkeys"
- bundle2-output-part: "listkeys" (params: 1 mandatory) empty payload
- bundle2-output: part 6: "LISTKEYS"
- bundle2-output: header chunk size: 35
- bundle2-output: closing payload chunk
- bundle2-output: bundle part: "phase-heads"
- bundle2-output-part: "phase-heads" 24 bytes payload
- bundle2-output: part 7: "PHASE-HEADS"
- bundle2-output: header chunk size: 18
- bundle2-output: payload chunk size: 24
- bundle2-output: closing payload chunk
- bundle2-output: end of bundle
- bundle2-input: start processing of HG20 stream
- bundle2-input: reading bundle2 stream parameters
- bundle2-input-bundle: with-transaction
- bundle2-input: start extraction of bundle2 parts
- bundle2-input: part header size: 44
- bundle2-input: part type: "CHANGEGROUP"
- bundle2-input: part id: "0"
- bundle2-input: part parameters: 2
- bundle2-input: found a handler for part changegroup
- bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
- adding changesets
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 1888
- bundle2-input: payload chunk size: 0
- adding manifests
- adding file changes
- added 1024 changesets with 0 changes to 0 files
- bundle2-input-part: total payload size 186208
- bundle2-input: part header size: 43
- bundle2-input: part type: "CHANGEGROUP"
- bundle2-input: part id: "1"
- bundle2-input: part parameters: 2
- bundle2-input: found a handler for part changegroup
- bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
- adding changesets
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 3084
- bundle2-input: payload chunk size: 0
- adding manifests
- adding file changes
- added 128 changesets with 0 changes to 0 files
- bundle2-input-part: total payload size 23564
- bundle2-input: part header size: 42
- bundle2-input: part type: "CHANGEGROUP"
- bundle2-input: part id: "2"
- bundle2-input: part parameters: 2
- bundle2-input: found a handler for part changegroup
- bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
- adding changesets
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 4096
- bundle2-input: payload chunk size: 3596
- bundle2-input: payload chunk size: 0
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- bundle2-input-part: total payload size 11788
- bundle2-input: part header size: 42
- bundle2-input: part type: "CHANGEGROUP"
- bundle2-input: part id: "3"
- bundle2-input: part parameters: 2
- bundle2-input: found a handler for part changegroup
- bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
- adding changesets
- bundle2-input: payload chunk size: 2956
- bundle2-input: payload chunk size: 0
- adding manifests
- adding file changes
- added 16 changesets with 0 changes to 0 files
- bundle2-input-part: total payload size 2956
- bundle2-input: part header size: 41
- bundle2-input: part type: "CHANGEGROUP"
- bundle2-input: part id: "4"
- bundle2-input: part parameters: 2
- bundle2-input: found a handler for part changegroup
- bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
- adding changesets
- bundle2-input: payload chunk size: 380
- bundle2-input: payload chunk size: 0
- adding manifests
- adding file changes
- added 2 changesets with 0 changes to 0 files
- bundle2-input-part: total payload size 380
- bundle2-input: part header size: 41
- bundle2-input: part type: "CHANGEGROUP"
- bundle2-input: part id: "5"
- bundle2-input: part parameters: 2
- bundle2-input: found a handler for part changegroup
- bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
- adding changesets
- bundle2-input: payload chunk size: 196
- bundle2-input: payload chunk size: 0
- adding manifests
- adding file changes
- added 1 changesets with 0 changes to 0 files
- bundle2-input-part: total payload size 196
- bundle2-input: part header size: 35
- bundle2-input: part type: "LISTKEYS"
- bundle2-input: part id: "6"
- bundle2-input: part parameters: 1
- bundle2-input: found a handler for part listkeys
- bundle2-input-part: "listkeys" (params: 1 mandatory) supported
- bundle2-input: payload chunk size: 0
- bundle2-input: part header size: 18
- bundle2-input: part type: "PHASE-HEADS"
- bundle2-input: part id: "7"
- bundle2-input: part parameters: 0
- bundle2-input: found a handler for part phase-heads
- bundle2-input-part: "phase-heads" supported
- bundle2-input: payload chunk size: 24
- bundle2-input: payload chunk size: 0
- bundle2-input-part: total payload size 24
- bundle2-input: part header size: 0
- bundle2-input: end of bundle2 stream
- bundle2-input-bundle: 7 parts total
- checking for updated bookmarks
- new changesets 1ea73414a91b:f864bc82f6a2
- updating the branch cache
- (run 'hg update' to get a working copy)
-
- $ touch oldbundles
- $ ls -1 server/.hg/cache/pullbundles > newbundles
- $ diff -u oldbundles newbundles
- --- oldbundles * (glob)
- +++ newbundles * (glob)
- @@ -0,0 +1,6 @@
- +02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
- +02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
- +02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg
- +02-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg
- +02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg
- +02-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg
- [1]
-
-pull the other missing entries (multiple heads pulled)
-------------------------------------------------------
-
- $ hg -R server log -G -T '{rev}:{node}\n' -r '1234+head()+(only(head(), 1234) and (merge() or branchpoint()))'
- o 2130:0f376356904fc8c1c6ceaac27990f2fd79b1f8c1
- :
- o 1663:1710092b3ab17a6d2ecad664580991a608537749
- |\
- | ~
- | o 1517:1dded5aafa0f8d548f6357cc2f8882dcc4489fbf
- |/
- o 1250:d83212ecaa436c80d6113cf915ba35e2db787e79
- :
- o 1234:f864bc82f6a2f2ecb49b83722e0895f9d657b0dd
- |
- ~
- $ hg -R client pull server --verbose
- pulling from server
- searching for changes
- all local heads known remotely
- pullbundle-cache: "missing" set sliced into 18 subranges in *.* seconds (glob)
- 1 changesets found
- 4 changesets found
- 8 changesets found
- 32 changesets found
- 128 changesets found
- 64 changesets found
- 32 changesets found
- 8 changesets found
- 4 changesets found
- 2 changesets found
- 1 changesets found
- 4 changesets found
- 8 changesets found
- 16 changesets found
- 256 changesets found
- 256 changesets found
- 64 changesets found
- 8 changesets found
- uncompressed size of bundle content:
- 188 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 740 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 1476 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 5892 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 23556 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 11780 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 5892 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 1476 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 740 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 372 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 188 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 740 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 1476 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 2948 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 47108 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 47108 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 11780 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 1476 (changelog)
- 4 (manifests)
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 32 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 128 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 32 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 0 changes to 0 files (+1 heads)
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 16 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- new changesets 17185c1c22f1:0f376356904f
- (run 'hg heads' to see heads, 'hg merge' to merge)
-
- $ mv newbundles oldbundles
- $ ls -1 server/.hg/cache/pullbundles > newbundles
- $ diff -u oldbundles newbundles
- --- oldbundles * (glob)
- +++ newbundles * (glob)
- @@ -1,6 +1,24 @@
- +02-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg
- +02-17185c1c22f1266b084daf7cfb07b6ebbfbc65ab-0000001235skip-0000000001size.hg
- +02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg
- +02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg
- +02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg
- 02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
- +02-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg
- +02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg
- 02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
- 02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg
- +02-694ef7e5b2984f1ec66c3d960799f4ff2459672c-0000001236skip-0000000004size.hg
- 02-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg
- +02-89fab188d2ce3c4cde6be031f2fc5b9b4ff248e3-0000000900skip-0000000004size.hg
- +02-97ede4832194ed56894374f2a1cc7a0022b486da-0000000904skip-0000000008size.hg
- +02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg
- +02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg
- +02-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg
- +02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg
- +02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg
- +02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg
- +02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg
- 02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg
- 02-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg
- +02-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg
- [1]
-
-Same Pullin with a different client
------------------------------------
- $ hg -R server log -G -T '{rev}:{node}\n' -r '0+1234+(::1234 and (merge() or branchpoint()))'
- o 1234:f864bc82f6a2f2ecb49b83722e0895f9d657b0dd
- :
- o 898:1388f909cd2b0685efd4e2ce076d198bce20922c
- :
- o 0:1ea73414a91b0920940797d8fc6a11e447f8ea1e
-
-
- $ hg -R client2 pull server -r 1234 --verbose
- pulling from server
- pullbundle-cache: "missing" set sliced into 6 subranges in *.* seconds (glob)
- 1024 changesets found in caches
- 128 changesets found in caches
- 64 changesets found in caches
- 16 changesets found in caches
- 2 changesets found in caches
- 1 changesets found in caches
- adding changesets
- adding manifests
- adding file changes
- added 1024 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 128 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 16 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:f864bc82f6a2
- (run 'hg update' to get a working copy)
-
- $ mv newbundles oldbundles
- $ ls -1 server/.hg/cache/pullbundles > newbundles
- $ diff -u oldbundles newbundles
-
- $ hg -R server log -G -T '{rev}:{node}\n' -r '1234+head()+(only(head(), 1234) and (merge() or branchpoint()))'
- o 2130:0f376356904fc8c1c6ceaac27990f2fd79b1f8c1
- :
- o 1663:1710092b3ab17a6d2ecad664580991a608537749
- |\
- | ~
- | o 1517:1dded5aafa0f8d548f6357cc2f8882dcc4489fbf
- |/
- o 1250:d83212ecaa436c80d6113cf915ba35e2db787e79
- :
- o 1234:f864bc82f6a2f2ecb49b83722e0895f9d657b0dd
- |
- ~
-
- $ hg -R client2 pull server --verbose
- pulling from server
- searching for changes
- all local heads known remotely
- pullbundle-cache: "missing" set sliced into 18 subranges in *.* seconds (glob)
- 1 changesets found in caches
- 4 changesets found in caches
- 8 changesets found in caches
- 32 changesets found in caches
- 128 changesets found in caches
- 64 changesets found in caches
- 32 changesets found in caches
- 8 changesets found in caches
- 4 changesets found in caches
- 2 changesets found in caches
- 1 changesets found in caches
- 4 changesets found in caches
- 8 changesets found in caches
- 16 changesets found in caches
- 256 changesets found in caches
- 256 changesets found in caches
- 64 changesets found in caches
- 8 changesets found in caches
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 32 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 128 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 32 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 0 changes to 0 files (+1 heads)
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 16 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- new changesets 17185c1c22f1:0f376356904f
- (run 'hg heads' to see heads, 'hg merge' to merge)
-
- $ mv newbundles oldbundles
- $ ls -1 server/.hg/cache/pullbundles > newbundles
- $ diff -u oldbundles newbundles
-
-different pull with a different client
---------------------------------------
-
- $ hg -R server log -G -T '{rev}:{node}\n' -r '87232049c8d1+0+1789+(::1789 and (merge() or branchpoint()))'
- o 2085:87232049c8d1f413105bf813b6bfc21da3e26a4f
- :
- o 1789:44e80141ad530a2aa085e9bd9b5311b57eff72ff
- :
- o 1663:1710092b3ab17a6d2ecad664580991a608537749
- |\
- o : 1250:d83212ecaa436c80d6113cf915ba35e2db787e79
- :/
- o 898:1388f909cd2b0685efd4e2ce076d198bce20922c
- :
- o 0:1ea73414a91b0920940797d8fc6a11e447f8ea1e
-
-
- $ hg -R client3 pull server -r 1789 --verbose
- pulling from server
- pullbundle-cache: "missing" set sliced into 9 subranges in *.* seconds (glob)
- 1024 changesets found in caches
- 227 changesets found
- 29 changesets found
- 128 changesets found
- 64 changesets found
- 32 changesets found
- 16 changesets found
- 2 changesets found
- 1 changesets found
- uncompressed size of bundle content:
- 41772 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 5340 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 23556 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 11780 (changelog)
- 4 (manifests)
- adding changesets
- adding manifests
- adding file changes
- added 1024 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 227 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 29 changesets with 0 changes to 0 files (+1 heads)
- adding changesets
- adding manifests
- adding file changes
- added 128 changesets with 0 changes to 0 files (-1 heads)
- adding changesets
- uncompressed size of bundle content:
- 5892 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 2948 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 372 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 188 (changelog)
- 4 (manifests)
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 32 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 16 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:44e80141ad53
- (run 'hg update' to get a working copy)
-
- $ mv newbundles oldbundles
- $ ls -1 server/.hg/cache/pullbundles > newbundles
- $ diff -u oldbundles newbundles
- --- oldbundles * (glob)
- +++ newbundles * (glob)
- @@ -3,20 +3,28 @@
- 02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg
- 02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg
- 02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg
- +02-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg
- 02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
- 02-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg
- 02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg
- 02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
- +02-59e60b258b18cde1e931cf30ce4ae62b49e37abd-0000001520skip-0000000002size.hg
- 02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg
- 02-694ef7e5b2984f1ec66c3d960799f4ff2459672c-0000001236skip-0000000004size.hg
- +02-7a55a4d5ce324910842c893b56173cf2a847cb9d-0000001472skip-0000000032size.hg
- 02-7f3a79522d6e904d52aea07c71e6cb612667e8f4-0000001216skip-0000000016size.hg
- 02-89fab188d2ce3c4cde6be031f2fc5b9b4ff248e3-0000000900skip-0000000004size.hg
- 02-97ede4832194ed56894374f2a1cc7a0022b486da-0000000904skip-0000000008size.hg
- +02-a4ab7df9d74053fb819c8a1c6a48ad605cc05f8a-0000001504skip-0000000016size.hg
- 02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg
- 02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg
- +02-c12927fef661d2463043347101b90067c2961333-0000001280skip-0000000128size.hg
- 02-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg
- +02-d83212ecaa436c80d6113cf915ba35e2db787e79-0000001024skip-0000000227size.hg
- 02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg
- 02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg
- +02-dc714c3a5d080165292ba99b097567d0b95e5756-0000001408skip-0000000064size.hg
- +02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000899skip-0000000029size.hg
- 02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg
- 02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg
- 02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg
- [1]
-
- $ hg -R server log -G -T '{rev}:{node}\n' -r '1789+head()+parents(roots(only(head(), 1789)))+(only(head(), 1789) and (merge() or branchpoint()))'
- o 2130:0f376356904fc8c1c6ceaac27990f2fd79b1f8c1
- :
- o 1789:44e80141ad530a2aa085e9bd9b5311b57eff72ff
- :
- : o 1517:1dded5aafa0f8d548f6357cc2f8882dcc4489fbf
- :/
- o 1250:d83212ecaa436c80d6113cf915ba35e2db787e79
- |
- ~
-
- $ hg -R client3 pull server --verbose
- pulling from server
- searching for changes
- all local heads known remotely
- pullbundle-cache: "missing" set sliced into 16 subranges in *.* seconds (glob)
- 1 changesets found
- 4 changesets found
- 8 changesets found
- 16 changesets found
- 128 changesets found in caches
- 64 changesets found in caches
- 32 changesets found in caches
- 8 changesets found in caches
- 4 changesets found in caches
- 2 changesets found in caches
- 1 changesets found
- 4 changesets found
- 8 changesets found
- 256 changesets found in caches
- 64 changesets found in caches
- 8 changesets found in caches
- uncompressed size of bundle content:
- 188 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 740 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 1476 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 2948 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 188 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 740 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 1476 (changelog)
- 4 (manifests)
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 0 changes to 0 files (+1 heads)
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 16 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 128 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 32 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- new changesets d1807e351389:0f376356904f
- (run 'hg heads' to see heads, 'hg merge' to merge)
-
- $ mv newbundles oldbundles
- $ ls -1 server/.hg/cache/pullbundles > newbundles
- $ diff -u oldbundles newbundles
- --- oldbundles * (glob)
- +++ newbundles * (glob)
- @@ -1,14 +1,17 @@
- 02-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg
- 02-17185c1c22f1266b084daf7cfb07b6ebbfbc65ab-0000001235skip-0000000001size.hg
- 02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg
- +02-1ed78f99f705cb819a02f1227c217728d008e461-0000001524skip-0000000004size.hg
- 02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg
- 02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg
- 02-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg
- 02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
- 02-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg
- 02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg
- +02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001264skip-0000000016size.hg
- 02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
- 02-59e60b258b18cde1e931cf30ce4ae62b49e37abd-0000001520skip-0000000002size.hg
- +02-5eaa75df73c454c1afff722301a4c73e897de94d-0000001256skip-0000000008size.hg
- 02-63ded94ceab180ac2fa13e1f0beeb4d2265998a3-0000001232skip-0000000002size.hg
- 02-694ef7e5b2984f1ec66c3d960799f4ff2459672c-0000001236skip-0000000004size.hg
- 02-7a55a4d5ce324910842c893b56173cf2a847cb9d-0000001472skip-0000000032size.hg
- @@ -19,7 +22,10 @@
- 02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg
- 02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg
- 02-c12927fef661d2463043347101b90067c2961333-0000001280skip-0000000128size.hg
- +02-c232505f58fdf70bcf5f6ab6a555f23ffc74f761-0000001523skip-0000000001size.hg
- 02-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg
- +02-ca970a853ea24846035ccb324cc8de49ef768748-0000001252skip-0000000004size.hg
- +02-d1807e3513890ac71c2e8d10e9dc9a5b58b15d4b-0000001251skip-0000000001size.hg
- 02-d83212ecaa436c80d6113cf915ba35e2db787e79-0000001024skip-0000000227size.hg
- 02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg
- 02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg
- @@ -27,6 +33,7 @@
- 02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000899skip-0000000029size.hg
- 02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg
- 02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg
- +02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001528skip-0000000008size.hg
- 02-ee2deecf044fa5583f66188c9177b0f13332adc2-0000001024skip-0000000128size.hg
- 02-f864bc82f6a2f2ecb49b83722e0895f9d657b0dd-0000001234skip-0000000001size.hg
- 02-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg
- [1]
-
-Single pull coming after various cache warming
-----------------------------------------------
-
- $ hg -R client4 pull --verbose server | grep -v 'add changeset'
- pulling from server
- requesting all changes
- pullbundle-cache: "missing" set sliced into 16 subranges in *.* seconds (glob)
- 1024 changesets found in caches
- 256 changesets found
- 128 changesets found in caches
- 64 changesets found in caches
- 32 changesets found in caches
- 8 changesets found in caches
- 4 changesets found in caches
- 2 changesets found in caches
- 1 changesets found in caches
- 4 changesets found in caches
- 8 changesets found in caches
- 16 changesets found in caches
- 256 changesets found in caches
- 256 changesets found in caches
- 64 changesets found in caches
- 8 changesets found in caches
- uncompressed size of bundle content:
- 47108 (changelog)
- 4 (manifests)
- adding changesets
- adding manifests
- adding file changes
- added 1024 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 128 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 32 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 0 changes to 0 files (+1 heads)
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 16 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:0f376356904f
- (run 'hg heads' to see heads, 'hg merge' to merge)
-
- $ mv newbundles oldbundles
- $ ls -1 server/.hg/cache/pullbundles > newbundles
- $ diff -u oldbundles newbundles
- --- oldbundles * (glob)
- +++ newbundles * (glob)
- @@ -7,6 +7,7 @@
- 02-44e80141ad530a2aa085e9bd9b5311b57eff72ff-0000001522skip-0000000001size.hg
- 02-467b6e370e816747e27de0d0b9237f4090a33656-0000001152skip-0000000064size.hg
- 02-484c46df3e41f371efd0ff74fa5221657527213f-0000001240skip-0000000008size.hg
- +02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001024skip-0000000256size.hg
- 02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001248skip-0000000032size.hg
- 02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001264skip-0000000016size.hg
- 02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
- [1]
-
-Pull with piece "not linear from head"
---------------------------------------
-
- $ hg -R server log -G -T '{rev}:{node}\n' -r 'branchpoint() + merge() + head() + children(branchpoint())'
- o 2130:0f376356904fc8c1c6ceaac27990f2fd79b1f8c1
- :
- o 1663:1710092b3ab17a6d2ecad664580991a608537749
- |\
- | o 1518:c72277ff25807eb444fa48a60afb434d78c21f2f
- | |
- | | o 1517:1dded5aafa0f8d548f6357cc2f8882dcc4489fbf
- | | :
- +---o 1251:d1807e3513890ac71c2e8d10e9dc9a5b58b15d4b
- | |
- o | 1250:d83212ecaa436c80d6113cf915ba35e2db787e79
- : |
- o | 899:c31a4e0cc28d677b8020e46aa3bb2fd5ee5b1a06
- |/
- o 898:1388f909cd2b0685efd4e2ce076d198bce20922c
- |
- ~
-
- $ hg init test-local-missing
- $ hg -R test-local-missing pull server --rev 899 --rev 1518 --verbose
- pulling from server
- pullbundle-cache: "missing" set sliced into 5 subranges in *.* seconds (glob)
- 512 changesets found
- 256 changesets found
- 128 changesets found
- 4 changesets found
- 1 changesets found
- uncompressed size of bundle content:
- 92968 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 46596 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 23300 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 734 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 186 (changelog)
- 4 (manifests)
- adding changesets
- adding manifests
- adding file changes
- added 512 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 128 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 0 changes to 0 files (+1 heads)
- new changesets 1ea73414a91b:c31a4e0cc28d
- (run 'hg heads' to see heads, 'hg merge' to merge)
- $ hg -R test-local-missing pull server --verbose
- pulling from server
- searching for changes
- all local heads known remotely
- pullbundle-cache: "missing" set sliced into 19 subranges in *.* seconds (glob)
- 4 changesets found
- 8 changesets found
- 16 changesets found
- 32 changesets found
- 64 changesets found
- 256 changesets found in caches
- 128 changesets found in caches
- 64 changesets found in caches
- 32 changesets found in caches
- 8 changesets found in caches
- 4 changesets found in caches
- 2 changesets found in caches
- 4 changesets found in caches
- 8 changesets found in caches
- 16 changesets found in caches
- 256 changesets found in caches
- 256 changesets found in caches
- 64 changesets found in caches
- 8 changesets found in caches
- uncompressed size of bundle content:
- 732 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 1460 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 2916 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 5828 (changelog)
- 4 (manifests)
- uncompressed size of bundle content:
- 11700 (changelog)
- 4 (manifests)
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 16 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 32 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 128 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 32 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 16 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- new changesets e600b80a2fc8:0f376356904f
- (run 'hg update' to get a working copy)
-
-Test cache setting
-==================
-
-cache directory
----------------
-
- $ mkdir bundle-cache
- $ cat << EOF >> $HGRCPATH
- > [pullbundle]
- > cache-directory=$TESTTMP/bundle-cache
- > EOF
-
- $ hg clone --pull server other-cache-directory
- requesting all changes
- pullbundle-cache: "missing" set sliced into 16 subranges in *.* seconds (glob)
- adding changesets
- adding manifests
- adding file changes
- added 1024 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 128 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 32 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 0 changes to 0 files (+1 heads)
- adding changesets
- adding manifests
- adding file changes
- added 4 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 16 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 256 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 64 changesets with 0 changes to 0 files
- adding changesets
- adding manifests
- adding file changes
- added 8 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:0f376356904f
- updating to branch default
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
- $ ls -1 bundle-cache
- 02-0f376356904fc8c1c6ceaac27990f2fd79b1f8c1-0000001856skip-0000000008size.hg
- 02-1dded5aafa0f8d548f6357cc2f8882dcc4489fbf-0000001516skip-0000000002size.hg
- 02-2dc4f1ab9029719714b8e0dde8e3725a5bb28472-0000001408skip-0000000064size.hg
- 02-2f0e261a08964bc1c607c0eda4978364c22a9b94-0000001504skip-0000000008size.hg
- 02-4a6d0f7d07d060b026d9fc690cd89cd26af96e42-0000001024skip-0000000256size.hg
- 02-540f762640ee62ca597ece26af725e6357e82805-0000000000skip-0000001024size.hg
- 02-89fab188d2ce3c4cde6be031f2fc5b9b4ff248e3-0000000900skip-0000000004size.hg
- 02-97ede4832194ed56894374f2a1cc7a0022b486da-0000000904skip-0000000008size.hg
- 02-b2d350c94c26edbb783aaa21fc24f1fc65c30e74-0000001536skip-0000000256size.hg
- 02-bbd293bd171fd5b711d428db46940a72eca7a40f-0000001280skip-0000000128size.hg
- 02-c72277ff25807eb444fa48a60afb434d78c21f2f-0000000899skip-0000000001size.hg
- 02-da87a81c5310760f414a933e6550b7e8e60cf241-0000001792skip-0000000064size.hg
- 02-dba2fddbf3c28198659046674a512afd616a1519-0000001472skip-0000000032size.hg
- 02-e469a7aa5cce57653b6b02ff46c80b2d94d62629-0000000912skip-0000000016size.hg
- 02-e74670ea99533967c5d90da3ddbc0318cc1fd502-0000001280skip-0000000256size.hg
- 02-fb6c210a224903e81e5a8d2ee099cb0c9526ba8c-0000001512skip-0000000004size.hg
--- a/tests/test-push-checkheads-partial-C1.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-partial-C1.t Thu Oct 25 16:33:10 2018 +0200
@@ -51,7 +51,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-partial-C2.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-partial-C2.t Thu Oct 25 16:33:10 2018 +0200
@@ -53,7 +53,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-partial-C3.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-partial-C3.t Thu Oct 25 16:33:10 2018 +0200
@@ -53,7 +53,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-partial-C4.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-partial-C4.t Thu Oct 25 16:33:10 2018 +0200
@@ -53,7 +53,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B2.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B2.t Thu Oct 25 16:33:10 2018 +0200
@@ -53,7 +53,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B3.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B3.t Thu Oct 25 16:33:10 2018 +0200
@@ -53,7 +53,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B4.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B4.t Thu Oct 25 16:33:10 2018 +0200
@@ -54,7 +54,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B5.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B5.t Thu Oct 25 16:33:10 2018 +0200
@@ -57,7 +57,6 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets d73caddc5533:821fb21d0dd2
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B8.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B8.t Thu Oct 25 16:33:10 2018 +0200
@@ -55,7 +55,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A2.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-superceed-A2.t Thu Oct 25 16:33:10 2018 +0200
@@ -52,7 +52,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A3.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-superceed-A3.t Thu Oct 25 16:33:10 2018 +0200
@@ -55,7 +55,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A6.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-superceed-A6.t Thu Oct 25 16:33:10 2018 +0200
@@ -59,7 +59,6 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
- new changesets d73caddc5533:0f88766e02d6
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A7.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-superceed-A7.t Thu Oct 25 16:33:10 2018 +0200
@@ -59,7 +59,6 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
- new changesets d73caddc5533:0f88766e02d6
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up 'desc(C0)'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D2.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-unpushed-D2.t Thu Oct 25 16:33:10 2018 +0200
@@ -57,7 +57,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D3.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-unpushed-D3.t Thu Oct 25 16:33:10 2018 +0200
@@ -56,7 +56,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets d73caddc5533
(run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D4.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-unpushed-D4.t Thu Oct 25 16:33:10 2018 +0200
@@ -73,7 +73,6 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
- new changesets d73caddc5533:0f88766e02d6
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D5.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-push-checkheads-unpushed-D5.t Thu Oct 25 16:33:10 2018 +0200
@@ -62,7 +62,6 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
- new changesets d73caddc5533:0f88766e02d6
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg up 'desc(C0)'
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-rewind.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-rewind.t Thu Oct 25 16:33:10 2018 +0200
@@ -86,14 +86,14 @@
$ hg rewind --hidden --to 'desc("c_B0")'
rewinded to 1 changesets
$ hg debugobsolete
- 7e594302a05d3769b27be88fc3cdfd39d7498498 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 073989a581cf430a844192364fa37606357cbbc2 4 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 073989a581cf430a844192364fa37606357cbbc2 4 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'user': 'test'}
$ hg obslog -r 'desc("c_B0")'
o 073989a581cf (3) c_B0
|
x 7e594302a05d (2) c_B0
- pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
- rewritten(meta) as 073989a581cf using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
+ pruned by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(meta) as 073989a581cf by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg log -G
o changeset: 3:073989a581cf
@@ -126,7 +126,7 @@
| x changeset: 2:7e594302a05d
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: meta-changed using rewind as 3:073989a581cf
+ | obsolete: meta-changed as 073989a581cf
| summary: c_B0
|
o changeset: 1:579f120ba918
@@ -159,20 +159,20 @@
$ hg rewind --hidden --to 'min(desc("c_B0"))'
rewinded to 1 changesets
$ hg debugobsolete
- 7e594302a05d3769b27be88fc3cdfd39d7498498 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 073989a581cf430a844192364fa37606357cbbc2 4 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
- 073989a581cf430a844192364fa37606357cbbc2 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 48acf2c0d9c8961859ce9a913671eb2adc9b057b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 073989a581cf430a844192364fa37606357cbbc2 4 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'user': 'test'}
+ 073989a581cf430a844192364fa37606357cbbc2 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 48acf2c0d9c8961859ce9a913671eb2adc9b057b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '34', 'user': 'test'}
$ hg obslog -r 'desc("c_B0")' --all
x 073989a581cf (3) c_B0
- | pruned using prune by test (Thu Jan 01 00:00:01 1970 +0000)
+ | pruned by test (Thu Jan 01 00:00:01 1970 +0000)
|
| o 48acf2c0d9c8 (4) c_B0
|/
x 7e594302a05d (2) c_B0
- pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
- rewritten(meta) as 073989a581cf using rewind by test (Thu Jan 01 00:00:00 1970 +0000)
- rewritten(meta, date) as 48acf2c0d9c8 using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
+ pruned by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(meta) as 073989a581cf by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(meta, date) as 48acf2c0d9c8 by test (Thu Jan 01 00:00:01 1970 +0000)
$ hg log -G
o changeset: 4:48acf2c0d9c8
@@ -204,14 +204,14 @@
|/ parent: 1:579f120ba918
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: pruned using prune
+ | obsolete: pruned
| summary: c_B0
|
| x changeset: 2:7e594302a05d
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using rewind as 4:48acf2c0d9c8
- | obsolete: meta-changed using rewind as 3:073989a581cf
+ | obsolete: rewritten as 48acf2c0d9c8
+ | obsolete: meta-changed as 073989a581cf
| summary: c_B0
|
o changeset: 1:579f120ba918
@@ -239,7 +239,7 @@
$ echo BB > B
$ hg amend -m 'c_B1'
$ hg log -G
- @ changeset: 3:25c8f5ab0c3b
+ @ changeset: 4:25c8f5ab0c3b
| tag: tip
| parent: 1:579f120ba918
| user: test
@@ -263,29 +263,30 @@
$ hg rewind --hidden --to 'desc("c_B0")' --as-divergence
rewinded to 1 changesets
$ hg debugobsolete
- 7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 48acf2c0d9c8961859ce9a913671eb2adc9b057b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'user': 'test'}
+ 3d16cbe1aa2b2b1764e67b6b6938d296c676b203 0 {7e594302a05d3769b27be88fc3cdfd39d7498498} (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 48acf2c0d9c8961859ce9a913671eb2adc9b057b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '34', 'user': 'test'}
$ hg obslog --rev 'desc("c_B0")'
- o 48acf2c0d9c8 (4) c_B0
+ o 48acf2c0d9c8 (5) c_B0
|
x 7e594302a05d (2) c_B0
- rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
- rewritten(meta, date) as 48acf2c0d9c8 using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
+ rewritten(description, content) as 25c8f5ab0c3b by test (Thu Jan 01 00:00:01 1970 +0000)
+ rewritten(meta, date) as 48acf2c0d9c8 by test (Thu Jan 01 00:00:01 1970 +0000)
$ hg log -G
- o changeset: 4:48acf2c0d9c8
+ o changeset: 5:48acf2c0d9c8
| tag: tip
| parent: 1:579f120ba918
| user: test
| date: Thu Jan 01 00:00:01 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: c_B0
|
- | @ changeset: 3:25c8f5ab0c3b
+ | @ changeset: 4:25c8f5ab0c3b
|/ parent: 1:579f120ba918
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: c_B1
|
o changeset: 1:579f120ba918
@@ -299,26 +300,32 @@
summary: c_ROOT
$ hg log -G --hidden
- o changeset: 4:48acf2c0d9c8
+ o changeset: 5:48acf2c0d9c8
| tag: tip
| parent: 1:579f120ba918
| user: test
| date: Thu Jan 01 00:00:01 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: c_B0
|
- | @ changeset: 3:25c8f5ab0c3b
+ | @ changeset: 4:25c8f5ab0c3b
|/ parent: 1:579f120ba918
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | instability: content-divergent
+ | trouble: divergent
| summary: c_B1
|
+ | x changeset: 3:3d16cbe1aa2b
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | obsolete: pruned
+ | | summary: temporary amend commit for 7e594302a05d
+ | |
| x changeset: 2:7e594302a05d
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using rewind as 4:48acf2c0d9c8
- | obsolete: rewritten using amend as 3:25c8f5ab0c3b
+ | obsolete: rewritten as 48acf2c0d9c8
+ | obsolete: rewritten as 25c8f5ab0c3b
| summary: c_B0
|
o changeset: 1:579f120ba918
@@ -337,7 +344,7 @@
$ hg prune 'max(desc("c_B0"))'
1 changesets pruned
$ hg log -G
- @ changeset: 3:25c8f5ab0c3b
+ @ changeset: 4:25c8f5ab0c3b
| tag: tip
| parent: 1:579f120ba918
| user: test
@@ -364,24 +371,25 @@
(1 changesets obsoleted)
working directory is now at d8b4471cfb3c
$ hg debugobsolete
- 7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 48acf2c0d9c8961859ce9a913671eb2adc9b057b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- 48acf2c0d9c8961859ce9a913671eb2adc9b057b 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 d8b4471cfb3caa290e0a78ae6bc57d78656c9075 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- 25c8f5ab0c3bb569ec672570f1a901be4c6f032b d8b4471cfb3caa290e0a78ae6bc57d78656c9075 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '43', 'operation': 'rewind', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 25c8f5ab0c3bb569ec672570f1a901be4c6f032b 0 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '9', 'user': 'test'}
+ 3d16cbe1aa2b2b1764e67b6b6938d296c676b203 0 {7e594302a05d3769b27be88fc3cdfd39d7498498} (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 48acf2c0d9c8961859ce9a913671eb2adc9b057b 4 (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '34', 'user': 'test'}
+ 48acf2c0d9c8961859ce9a913671eb2adc9b057b 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:01 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 d8b4471cfb3caa290e0a78ae6bc57d78656c9075 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '34', 'user': 'test'}
+ 25c8f5ab0c3bb569ec672570f1a901be4c6f032b d8b4471cfb3caa290e0a78ae6bc57d78656c9075 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '43', 'user': 'test'}
$ hg obslog --rev 'desc("c_B0")'
- @ d8b4471cfb3c (5) c_B0
+ @ d8b4471cfb3c (6) c_B0
|\
- x | 25c8f5ab0c3b (3) c_B1
- |/ rewritten(description, meta, date, content) as d8b4471cfb3c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
+ x | 25c8f5ab0c3b (4) c_B1
+ |/ rewritten(description, meta, date, content) as d8b4471cfb3c by test (Thu Jan 01 00:00:02 1970 +0000)
|
x 7e594302a05d (2) c_B0
- rewritten(description, content) as 25c8f5ab0c3b using amend by test (Thu Jan 01 00:00:01 1970 +0000)
- rewritten(meta, date) as 48acf2c0d9c8 using rewind by test (Thu Jan 01 00:00:01 1970 +0000)
- rewritten(meta, date) as d8b4471cfb3c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
+ rewritten(description, content) as 25c8f5ab0c3b by test (Thu Jan 01 00:00:01 1970 +0000)
+ rewritten(meta, date) as 48acf2c0d9c8 by test (Thu Jan 01 00:00:01 1970 +0000)
+ rewritten(meta, date) as d8b4471cfb3c by test (Thu Jan 01 00:00:02 1970 +0000)
$ hg log -G
- @ changeset: 5:d8b4471cfb3c
+ @ changeset: 6:d8b4471cfb3c
| tag: tip
| parent: 1:579f120ba918
| user: test
@@ -399,33 +407,39 @@
summary: c_ROOT
$ hg log -G --hidden
- @ changeset: 5:d8b4471cfb3c
+ @ changeset: 6:d8b4471cfb3c
| tag: tip
| parent: 1:579f120ba918
| user: test
| date: Thu Jan 01 00:00:02 1970 +0000
| summary: c_B0
|
- | x changeset: 4:48acf2c0d9c8
+ | x changeset: 5:48acf2c0d9c8
|/ parent: 1:579f120ba918
| user: test
| date: Thu Jan 01 00:00:01 1970 +0000
- | obsolete: pruned using prune
+ | obsolete: pruned
| summary: c_B0
|
- | x changeset: 3:25c8f5ab0c3b
+ | x changeset: 4:25c8f5ab0c3b
|/ parent: 1:579f120ba918
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using rewind as 5:d8b4471cfb3c
+ | obsolete: rewritten as d8b4471cfb3c
| summary: c_B1
|
+ | x changeset: 3:3d16cbe1aa2b
+ | | user: test
+ | | date: Thu Jan 01 00:00:00 1970 +0000
+ | | obsolete: pruned
+ | | summary: temporary amend commit for 7e594302a05d
+ | |
| x changeset: 2:7e594302a05d
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using rewind as 5:d8b4471cfb3c
- | obsolete: rewritten using rewind as 4:48acf2c0d9c8
- | obsolete: rewritten using amend as 3:25c8f5ab0c3b
+ | obsolete: rewritten as d8b4471cfb3c
+ | obsolete: rewritten as 48acf2c0d9c8
+ | obsolete: rewritten as 25c8f5ab0c3b
| summary: c_B0
|
o changeset: 1:579f120ba918
@@ -507,14 +521,14 @@
summary: c_ROOT
$ hg debugobsolete
- 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'operation': 'split', 'user': 'test'}
+ 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'user': 'test'}
$ hg obslog --all
@ 9576e80d6851 (5) c_CD0
|
| o a0316c4c5417 (4) c_CD0
|/
x 49fb7d900906 (3) c_CD0
- rewritten(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000)
+ rewritten(parent, content) as 9576e80d6851, a0316c4c5417 by test (Thu Jan 01 00:00:02 1970 +0000)
Actual rewind
@@ -525,24 +539,24 @@
(2 changesets obsoleted)
working directory is now at 4535d0af405c
$ hg debugobsolete
- 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'operation': 'split', 'user': 'test'}
- 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
- 9576e80d6851ce79cd535e2dc5fa01b444d89a39 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '14', 'operation': 'rewind', 'user': 'test'}
- a0316c4c54179357e71d068fb8884678ebc7c351 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '10', 'operation': 'rewind', 'user': 'test'}
+ 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'user': 'test'}
+ 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '2', 'user': 'test'}
+ 9576e80d6851ce79cd535e2dc5fa01b444d89a39 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '14', 'user': 'test'}
+ a0316c4c54179357e71d068fb8884678ebc7c351 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '10', 'user': 'test'}
$ hg obslog
@ 4535d0af405c (6) c_CD0
|\
| \
| |\
| x | 9576e80d6851 (5) c_CD0
- |/ / rewritten(meta, parent, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
+ |/ / rewritten(meta, parent, content) as 4535d0af405c by test (Thu Jan 01 00:00:02 1970 +0000)
| |
| x a0316c4c5417 (4) c_CD0
- |/ rewritten(meta, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
+ |/ rewritten(meta, content) as 4535d0af405c by test (Thu Jan 01 00:00:02 1970 +0000)
|
x 49fb7d900906 (3) c_CD0
- rewritten(meta) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
- rewritten(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000)
+ rewritten(meta) as 4535d0af405c by test (Thu Jan 01 00:00:02 1970 +0000)
+ rewritten(parent, content) as 9576e80d6851, a0316c4c5417 by test (Thu Jan 01 00:00:02 1970 +0000)
$ hg log -G
@ changeset: 6:4535d0af405c
@@ -584,32 +598,32 @@
(1 changesets obsoleted)
working directory is now at 85be7b94f69e
$ hg debugobsolete
- 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'operation': 'split', 'user': 'test'}
- 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '2', 'operation': 'rewind', 'user': 'test'}
- 9576e80d6851ce79cd535e2dc5fa01b444d89a39 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '14', 'operation': 'rewind', 'user': 'test'}
- a0316c4c54179357e71d068fb8884678ebc7c351 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '10', 'operation': 'rewind', 'user': 'test'}
- a0316c4c54179357e71d068fb8884678ebc7c351 73a1ac2e570de1f33bbea7d8260b00d5af1d30a7 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- 9576e80d6851ce79cd535e2dc5fa01b444d89a39 85be7b94f69e936d6f0fc52118211da82fe4e838 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
- 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 73a1ac2e570de1f33bbea7d8260b00d5af1d30a7 85be7b94f69e936d6f0fc52118211da82fe4e838 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '46', 'operation': 'rewind', 'user': 'test'}
+ 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e a0316c4c54179357e71d068fb8884678ebc7c351 9576e80d6851ce79cd535e2dc5fa01b444d89a39 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '12', 'user': 'test'}
+ 49fb7d900906b0a3d329e90da4dcb0a7582d3b6e 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 4 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '2', 'user': 'test'}
+ 9576e80d6851ce79cd535e2dc5fa01b444d89a39 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '14', 'user': 'test'}
+ a0316c4c54179357e71d068fb8884678ebc7c351 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 0 (Thu Jan 01 00:00:02 1970 +0000) {'ef1': '10', 'user': 'test'}
+ a0316c4c54179357e71d068fb8884678ebc7c351 73a1ac2e570de1f33bbea7d8260b00d5af1d30a7 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '34', 'user': 'test'}
+ 9576e80d6851ce79cd535e2dc5fa01b444d89a39 85be7b94f69e936d6f0fc52118211da82fe4e838 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '38', 'user': 'test'}
+ 4535d0af405c1bf35f37b35f26ec6f9acfa6fe0b 73a1ac2e570de1f33bbea7d8260b00d5af1d30a7 85be7b94f69e936d6f0fc52118211da82fe4e838 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '46', 'user': 'test'}
$ hg obslog -r -2:
o 73a1ac2e570d (7) c_CD0
|\
+---@ 85be7b94f69e (8) c_CD0
| | |
x---+ 4535d0af405c (6) c_CD0
- |\| | rewritten(meta, date, parent, content) as 73a1ac2e570d, 85be7b94f69e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+ |\| | rewritten(meta, date, parent, content) as 73a1ac2e570d, 85be7b94f69e by test (Thu Jan 01 00:00:03 1970 +0000)
| | |
+---x 9576e80d6851 (5) c_CD0
- | | rewritten(meta, parent, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
- | | rewritten(meta, date, parent) as 85be7b94f69e using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+ | | rewritten(meta, parent, content) as 4535d0af405c by test (Thu Jan 01 00:00:02 1970 +0000)
+ | | rewritten(meta, date, parent) as 85be7b94f69e by test (Thu Jan 01 00:00:03 1970 +0000)
| |
| x a0316c4c5417 (4) c_CD0
- |/ rewritten(meta, content) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
- | rewritten(meta, date) as 73a1ac2e570d using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+ |/ rewritten(meta, content) as 4535d0af405c by test (Thu Jan 01 00:00:02 1970 +0000)
+ | rewritten(meta, date) as 73a1ac2e570d by test (Thu Jan 01 00:00:03 1970 +0000)
|
x 49fb7d900906 (3) c_CD0
- rewritten(meta) as 4535d0af405c using rewind by test (Thu Jan 01 00:00:02 1970 +0000)
- rewritten(parent, content) as 9576e80d6851, a0316c4c5417 using split by test (Thu Jan 01 00:00:02 1970 +0000)
+ rewritten(meta) as 4535d0af405c by test (Thu Jan 01 00:00:02 1970 +0000)
+ rewritten(parent, content) as 9576e80d6851, a0316c4c5417 by test (Thu Jan 01 00:00:02 1970 +0000)
$ hg log -G
@ changeset: 8:85be7b94f69e
@@ -659,33 +673,34 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo AA >> A
$ hg amend -m 'c_A1'
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg evolve --all
move:[2] c_B0
- atop:[3] c_A1
+ atop:[4] c_A1
working directory is now at a65fceb2324a
$ hg debugobsolete
- 579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ 579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'user': 'test'}
+ ddb26d894c1c661052affbfb400159e34baae86e 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'user': 'test'}
$ hg obslog -r 'desc("c_A1")::'
- @ a65fceb2324a (4) c_B0
+ @ a65fceb2324a (5) c_B0
|
- | o d952d1794ff6 (3) c_A1
+ | o d952d1794ff6 (4) c_A1
| |
| x 579f120ba918 (1) c_A0
- | rewritten(description, content) as d952d1794ff6 using amend by test (Thu Jan 01 00:00:03 1970 +0000)
+ | rewritten(description, content) as d952d1794ff6 by test (Thu Jan 01 00:00:03 1970 +0000)
|
x 7e594302a05d (2) c_B0
- rewritten(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
+ rewritten(parent) as a65fceb2324a by test (Thu Jan 01 00:00:03 1970 +0000)
$ hg log -G
- @ changeset: 4:a65fceb2324a
+ @ changeset: 5:a65fceb2324a
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: c_B0
|
- o changeset: 3:d952d1794ff6
+ o changeset: 4:d952d1794ff6
| parent: 0:eba9c2249fe7
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -705,30 +720,31 @@
(1 changesets obsoleted)
working directory is now at 96622b0702dd
$ hg debugobsolete
- 579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 96622b0702dd86e3a702b0235b420da41f072efe 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- a65fceb2324ae1eb1231610193d24a5fa02c7c0e 96622b0702dd86e3a702b0235b420da41f072efe 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
+ 579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'user': 'test'}
+ ddb26d894c1c661052affbfb400159e34baae86e 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 96622b0702dd86e3a702b0235b420da41f072efe 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '34', 'user': 'test'}
+ a65fceb2324ae1eb1231610193d24a5fa02c7c0e 96622b0702dd86e3a702b0235b420da41f072efe 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '38', 'user': 'test'}
$ hg obslog
- @ 96622b0702dd (5) c_B0
+ @ 96622b0702dd (6) c_B0
|\
- | x a65fceb2324a (4) c_B0
- |/ rewritten(meta, date, parent) as 96622b0702dd using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+ | x a65fceb2324a (5) c_B0
+ |/ rewritten(meta, date, parent) as 96622b0702dd by test (Thu Jan 01 00:00:03 1970 +0000)
|
x 7e594302a05d (2) c_B0
- rewritten(meta, date) as 96622b0702dd using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
- rewritten(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
+ rewritten(meta, date) as 96622b0702dd by test (Thu Jan 01 00:00:03 1970 +0000)
+ rewritten(parent) as a65fceb2324a by test (Thu Jan 01 00:00:03 1970 +0000)
$ hg log -G
- @ changeset: 5:96622b0702dd
+ @ changeset: 6:96622b0702dd
| tag: tip
| parent: 1:579f120ba918
| user: test
| date: Thu Jan 01 00:00:03 1970 +0000
- | instability: orphan
+ | trouble: unstable
| summary: c_B0
|
- | o changeset: 3:d952d1794ff6
+ | o changeset: 4:d952d1794ff6
| | parent: 0:eba9c2249fe7
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
@@ -737,7 +753,7 @@
x | changeset: 1:579f120ba918
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: rewritten using amend as 3:d952d1794ff6
+ | obsolete: rewritten as d952d1794ff6
| summary: c_A0
|
o changeset: 0:eba9c2249fe7
@@ -758,14 +774,14 @@
working directory is now at 7b1440274cc3
$ echo 'default-date = 5 0' >> $HGRCPATH
$ hg log -G
- @ changeset: 6:7b1440274cc3
+ @ changeset: 7:7b1440274cc3
| tag: tip
- | parent: 3:d952d1794ff6
+ | parent: 4:d952d1794ff6
| user: test
| date: Thu Jan 01 00:00:04 1970 +0000
| summary: c_B0
|
- o changeset: 3:d952d1794ff6
+ o changeset: 4:d952d1794ff6
| parent: 0:eba9c2249fe7
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -777,25 +793,26 @@
summary: c_ROOT
$ hg debugobsolete
- 579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 96622b0702dd86e3a702b0235b420da41f072efe 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- a65fceb2324ae1eb1231610193d24a5fa02c7c0e 96622b0702dd86e3a702b0235b420da41f072efe 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
- a65fceb2324ae1eb1231610193d24a5fa02c7c0e 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 4 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- 96622b0702dd86e3a702b0235b420da41f072efe 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 0 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
+ 579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'user': 'test'}
+ ddb26d894c1c661052affbfb400159e34baae86e 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 96622b0702dd86e3a702b0235b420da41f072efe 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '34', 'user': 'test'}
+ a65fceb2324ae1eb1231610193d24a5fa02c7c0e 96622b0702dd86e3a702b0235b420da41f072efe 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '38', 'user': 'test'}
+ a65fceb2324ae1eb1231610193d24a5fa02c7c0e 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 4 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '34', 'user': 'test'}
+ 96622b0702dd86e3a702b0235b420da41f072efe 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 0 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '38', 'user': 'test'}
$ hg obslog
- @ 7b1440274cc3 (6) c_B0
+ @ 7b1440274cc3 (7) c_B0
|\
- x | 96622b0702dd (5) c_B0
- |\| rewritten(meta, date, parent) as 7b1440274cc3 using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
+ x | 96622b0702dd (6) c_B0
+ |\| rewritten(meta, date, parent) as 7b1440274cc3 by test (Thu Jan 01 00:00:04 1970 +0000)
| |
- | x a65fceb2324a (4) c_B0
- |/ rewritten(meta, date) as 7b1440274cc3 using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
- | rewritten(meta, date, parent) as 96622b0702dd using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+ | x a65fceb2324a (5) c_B0
+ |/ rewritten(meta, date) as 7b1440274cc3 by test (Thu Jan 01 00:00:04 1970 +0000)
+ | rewritten(meta, date, parent) as 96622b0702dd by test (Thu Jan 01 00:00:03 1970 +0000)
|
x 7e594302a05d (2) c_B0
- rewritten(meta, date) as 96622b0702dd using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
- rewritten(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
+ rewritten(meta, date) as 96622b0702dd by test (Thu Jan 01 00:00:03 1970 +0000)
+ rewritten(parent) as a65fceb2324a by test (Thu Jan 01 00:00:03 1970 +0000)
Automatically rewinding the full stack (with --to)
--------------------------------------------------
@@ -805,42 +822,43 @@
(2 changesets obsoleted)
working directory is now at 70892f498f29
$ hg debugobsolete
- 579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 96622b0702dd86e3a702b0235b420da41f072efe 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- a65fceb2324ae1eb1231610193d24a5fa02c7c0e 96622b0702dd86e3a702b0235b420da41f072efe 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
- a65fceb2324ae1eb1231610193d24a5fa02c7c0e 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 4 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- 96622b0702dd86e3a702b0235b420da41f072efe 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 0 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
- 579f120ba91885449adc92eedf48ef3569742cee c0d232501dd8e52b8ca8a266f25db89f5120c17f 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- 96622b0702dd86e3a702b0235b420da41f072efe 70892f498f2993d626848bb312ff856168d0b9c4 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
- 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 70892f498f2993d626848bb312ff856168d0b9c4 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
- d952d1794ff657f5c2a82225d2e6307ed930b32f c0d232501dd8e52b8ca8a266f25db89f5120c17f 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '43', 'operation': 'rewind', 'user': 'test'}
+ 579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'user': 'test'}
+ ddb26d894c1c661052affbfb400159e34baae86e 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 96622b0702dd86e3a702b0235b420da41f072efe 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '34', 'user': 'test'}
+ a65fceb2324ae1eb1231610193d24a5fa02c7c0e 96622b0702dd86e3a702b0235b420da41f072efe 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '38', 'user': 'test'}
+ a65fceb2324ae1eb1231610193d24a5fa02c7c0e 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 4 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '34', 'user': 'test'}
+ 96622b0702dd86e3a702b0235b420da41f072efe 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 0 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '38', 'user': 'test'}
+ 579f120ba91885449adc92eedf48ef3569742cee c0d232501dd8e52b8ca8a266f25db89f5120c17f 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '34', 'user': 'test'}
+ 96622b0702dd86e3a702b0235b420da41f072efe 70892f498f2993d626848bb312ff856168d0b9c4 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '38', 'user': 'test'}
+ 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 70892f498f2993d626848bb312ff856168d0b9c4 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '38', 'user': 'test'}
+ d952d1794ff657f5c2a82225d2e6307ed930b32f c0d232501dd8e52b8ca8a266f25db89f5120c17f 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '43', 'user': 'test'}
$ hg obslog
- @ 70892f498f29 (8) c_B0
+ @ 70892f498f29 (9) c_B0
|\
- x | 7b1440274cc3 (6) c_B0
- |\| rewritten(meta, date, parent) as 70892f498f29 using rewind by test (Thu Jan 01 00:00:05 1970 +0000)
+ x | 7b1440274cc3 (7) c_B0
+ |\| rewritten(meta, date, parent) as 70892f498f29 by test (Thu Jan 01 00:00:05 1970 +0000)
| |
- | x 96622b0702dd (5) c_B0
- |/| rewritten(meta, date, parent) as 70892f498f29 using rewind by test (Thu Jan 01 00:00:05 1970 +0000)
- | | rewritten(meta, date, parent) as 7b1440274cc3 using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
+ | x 96622b0702dd (6) c_B0
+ |/| rewritten(meta, date, parent) as 70892f498f29 by test (Thu Jan 01 00:00:05 1970 +0000)
+ | | rewritten(meta, date, parent) as 7b1440274cc3 by test (Thu Jan 01 00:00:04 1970 +0000)
| |
- x | a65fceb2324a (4) c_B0
- |/ rewritten(meta, date) as 7b1440274cc3 using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
- | rewritten(meta, date, parent) as 96622b0702dd using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+ x | a65fceb2324a (5) c_B0
+ |/ rewritten(meta, date) as 7b1440274cc3 by test (Thu Jan 01 00:00:04 1970 +0000)
+ | rewritten(meta, date, parent) as 96622b0702dd by test (Thu Jan 01 00:00:03 1970 +0000)
|
x 7e594302a05d (2) c_B0
- rewritten(meta, date) as 96622b0702dd using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
- rewritten(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
+ rewritten(meta, date) as 96622b0702dd by test (Thu Jan 01 00:00:03 1970 +0000)
+ rewritten(parent) as a65fceb2324a by test (Thu Jan 01 00:00:03 1970 +0000)
$ hg log -G
- @ changeset: 8:70892f498f29
+ @ changeset: 9:70892f498f29
| tag: tip
| user: test
| date: Thu Jan 01 00:00:05 1970 +0000
| summary: c_B0
|
- o changeset: 7:c0d232501dd8
+ o changeset: 8:c0d232501dd8
| parent: 0:eba9c2249fe7
| user: test
| date: Thu Jan 01 00:00:05 1970 +0000
@@ -861,50 +879,51 @@
(2 changesets obsoleted)
working directory is now at 141aedbbde8f
$ hg debugobsolete
- 579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 7e594302a05d3769b27be88fc3cdfd39d7498498 96622b0702dd86e3a702b0235b420da41f072efe 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- a65fceb2324ae1eb1231610193d24a5fa02c7c0e 96622b0702dd86e3a702b0235b420da41f072efe 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
- a65fceb2324ae1eb1231610193d24a5fa02c7c0e 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 4 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- 96622b0702dd86e3a702b0235b420da41f072efe 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 0 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
- 579f120ba91885449adc92eedf48ef3569742cee c0d232501dd8e52b8ca8a266f25db89f5120c17f 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- 96622b0702dd86e3a702b0235b420da41f072efe 70892f498f2993d626848bb312ff856168d0b9c4 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
- 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 70892f498f2993d626848bb312ff856168d0b9c4 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
- d952d1794ff657f5c2a82225d2e6307ed930b32f c0d232501dd8e52b8ca8a266f25db89f5120c17f 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '43', 'operation': 'rewind', 'user': 'test'}
- d952d1794ff657f5c2a82225d2e6307ed930b32f 7b4aed5e99d2734da6cc25f0095876c5cb6e8084 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '34', 'operation': 'rewind', 'user': 'test'}
- 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 141aedbbde8f407fc8a8a7355221733b0fc01ca5 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
- 70892f498f2993d626848bb312ff856168d0b9c4 141aedbbde8f407fc8a8a7355221733b0fc01ca5 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '38', 'operation': 'rewind', 'user': 'test'}
- c0d232501dd8e52b8ca8a266f25db89f5120c17f 7b4aed5e99d2734da6cc25f0095876c5cb6e8084 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '43', 'operation': 'rewind', 'user': 'test'}
+ 579f120ba91885449adc92eedf48ef3569742cee d952d1794ff657f5c2a82225d2e6307ed930b32f 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '9', 'user': 'test'}
+ ddb26d894c1c661052affbfb400159e34baae86e 0 {579f120ba91885449adc92eedf48ef3569742cee} (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '0', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 a65fceb2324ae1eb1231610193d24a5fa02c7c0e 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '4', 'user': 'test'}
+ 7e594302a05d3769b27be88fc3cdfd39d7498498 96622b0702dd86e3a702b0235b420da41f072efe 4 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '34', 'user': 'test'}
+ a65fceb2324ae1eb1231610193d24a5fa02c7c0e 96622b0702dd86e3a702b0235b420da41f072efe 0 (Thu Jan 01 00:00:03 1970 +0000) {'ef1': '38', 'user': 'test'}
+ a65fceb2324ae1eb1231610193d24a5fa02c7c0e 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 4 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '34', 'user': 'test'}
+ 96622b0702dd86e3a702b0235b420da41f072efe 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 0 (Thu Jan 01 00:00:04 1970 +0000) {'ef1': '38', 'user': 'test'}
+ 579f120ba91885449adc92eedf48ef3569742cee c0d232501dd8e52b8ca8a266f25db89f5120c17f 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '34', 'user': 'test'}
+ 96622b0702dd86e3a702b0235b420da41f072efe 70892f498f2993d626848bb312ff856168d0b9c4 4 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '38', 'user': 'test'}
+ 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 70892f498f2993d626848bb312ff856168d0b9c4 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '38', 'user': 'test'}
+ d952d1794ff657f5c2a82225d2e6307ed930b32f c0d232501dd8e52b8ca8a266f25db89f5120c17f 0 (Thu Jan 01 00:00:05 1970 +0000) {'ef1': '43', 'user': 'test'}
+ d952d1794ff657f5c2a82225d2e6307ed930b32f 7b4aed5e99d2734da6cc25f0095876c5cb6e8084 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '34', 'user': 'test'}
+ 7b1440274cc3b3f8bfcffc891172a7d2d7e9140c 141aedbbde8f407fc8a8a7355221733b0fc01ca5 4 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '38', 'user': 'test'}
+ 70892f498f2993d626848bb312ff856168d0b9c4 141aedbbde8f407fc8a8a7355221733b0fc01ca5 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '38', 'user': 'test'}
+ c0d232501dd8e52b8ca8a266f25db89f5120c17f 7b4aed5e99d2734da6cc25f0095876c5cb6e8084 0 (Thu Jan 01 00:00:06 1970 +0000) {'ef1': '43', 'user': 'test'}
$ hg obslog
- @ 141aedbbde8f (10) c_B0
+ @ 141aedbbde8f (11) c_B0
|\
- x | 70892f498f29 (8) c_B0
- |\| rewritten(meta, date, parent) as 141aedbbde8f using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
+ x | 70892f498f29 (9) c_B0
+ |\| rewritten(meta, date, parent) as 141aedbbde8f by test (Thu Jan 01 00:00:06 1970 +0000)
| |
- | x 7b1440274cc3 (6) c_B0
- |/| rewritten(meta, date, parent) as 141aedbbde8f using rewind by test (Thu Jan 01 00:00:06 1970 +0000)
- | | rewritten(meta, date, parent) as 70892f498f29 using rewind by test (Thu Jan 01 00:00:05 1970 +0000)
+ | x 7b1440274cc3 (7) c_B0
+ |/| rewritten(meta, date, parent) as 141aedbbde8f by test (Thu Jan 01 00:00:06 1970 +0000)
+ | | rewritten(meta, date, parent) as 70892f498f29 by test (Thu Jan 01 00:00:05 1970 +0000)
| |
- x | 96622b0702dd (5) c_B0
- |\| rewritten(meta, date, parent) as 70892f498f29 using rewind by test (Thu Jan 01 00:00:05 1970 +0000)
- | | rewritten(meta, date, parent) as 7b1440274cc3 using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
+ x | 96622b0702dd (6) c_B0
+ |\| rewritten(meta, date, parent) as 70892f498f29 by test (Thu Jan 01 00:00:05 1970 +0000)
+ | | rewritten(meta, date, parent) as 7b1440274cc3 by test (Thu Jan 01 00:00:04 1970 +0000)
| |
- | x a65fceb2324a (4) c_B0
- |/ rewritten(meta, date) as 7b1440274cc3 using rewind by test (Thu Jan 01 00:00:04 1970 +0000)
- | rewritten(meta, date, parent) as 96622b0702dd using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
+ | x a65fceb2324a (5) c_B0
+ |/ rewritten(meta, date) as 7b1440274cc3 by test (Thu Jan 01 00:00:04 1970 +0000)
+ | rewritten(meta, date, parent) as 96622b0702dd by test (Thu Jan 01 00:00:03 1970 +0000)
|
x 7e594302a05d (2) c_B0
- rewritten(meta, date) as 96622b0702dd using rewind by test (Thu Jan 01 00:00:03 1970 +0000)
- rewritten(parent) as a65fceb2324a using evolve by test (Thu Jan 01 00:00:03 1970 +0000)
+ rewritten(meta, date) as 96622b0702dd by test (Thu Jan 01 00:00:03 1970 +0000)
+ rewritten(parent) as a65fceb2324a by test (Thu Jan 01 00:00:03 1970 +0000)
$ hg log -G
- @ changeset: 10:141aedbbde8f
+ @ changeset: 11:141aedbbde8f
| tag: tip
| user: test
| date: Thu Jan 01 00:00:06 1970 +0000
| summary: c_B0
|
- o changeset: 9:7b4aed5e99d2
+ o changeset: 10:7b4aed5e99d2
| parent: 0:eba9c2249fe7
| user: test
| date: Thu Jan 01 00:00:06 1970 +0000
--- a/tests/test-sharing.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-sharing.t Thu Oct 25 16:33:10 2018 +0200
@@ -46,7 +46,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 0dc9c9f6ab91
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Let's commit a preliminary change and push it to ``test-repo`` for
@@ -70,8 +69,10 @@
Figure SG02
$ hg shortlog --hidden -G
- @ 2:60ffde5765c5 draft fix bug 37
+ @ 3:60ffde5765c5 draft fix bug 37
|
+ | x 2:2a039763c0f4 draft temporary amend commit for f6490818a721
+ | |
| x 1:f6490818a721 draft prelim change
|/
o 0:0dc9c9f6ab91 public create new project
@@ -86,9 +87,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 1 new obsolescence markers
+ 2 new obsolescence markers
obsoleted 1 changesets
- new changesets 60ffde5765c5
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "60ffde5765c5: fix bug 37"
1 other heads for branch "default"
@@ -108,8 +108,10 @@
Figure SG04 (dev-repo)
$ hg shortlog --hidden -G
- @ 3:de6151c48e1c draft fix bug 37
+ @ 4:de6151c48e1c draft fix bug 37
|
+ | x 3:ad19d3570adb draft temporary amend commit for 60ffde5765c5
+ | |
| x 2:60ffde5765c5 draft fix bug 37
|/
| x 1:f6490818a721 draft prelim change
@@ -123,10 +125,12 @@
updated to "de6151c48e1c: fix bug 37"
1 other heads for branch "default"
$ hg shortlog --hidden -G
- @ 3:de6151c48e1c draft fix bug 37
+ @ 4:de6151c48e1c draft fix bug 37
|
- | x 2:60ffde5765c5 draft fix bug 37
+ | x 3:60ffde5765c5 draft fix bug 37
|/
+ | x 2:2a039763c0f4 draft temporary amend commit for f6490818a721
+ | |
| x 1:f6490818a721 draft prelim change
|/
o 0:0dc9c9f6ab91 public create new project
@@ -139,7 +143,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 2 new obsolescence markers
+ 4 new obsolescence markers
Now that the fix is public, we cannot amend it any more.
$ hg amend -m 'fix bug 37'
@@ -155,7 +159,7 @@
Oops, still have draft changesets in dev-repo: push the phase change there.
$ hg -R ../dev-repo shortlog -r 'draft()'
- 3:de6151c48e1c draft fix bug 37
+ 4:de6151c48e1c draft fix bug 37
$ hg push ../dev-repo
pushing to ../dev-repo
searching for changes
@@ -208,7 +212,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 1 new obsolescence markers
+ 2 new obsolescence markers
obsoleted 1 changesets
updating bookmark bug15
$ hg -R ../review bookmarks
@@ -253,7 +257,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 1 new obsolescence markers
+ 2 new obsolescence markers
obsoleted 1 changesets
updating bookmark featureX
@@ -268,7 +272,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 2 new obsolescence markers
+ 4 new obsolescence markers
$ hg -R ../public bookmarks
no bookmarks set
$ hg push ../review
@@ -279,7 +283,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 1 new obsolescence markers
+ 2 new obsolescence markers
obsoleted 1 changesets
updating bookmark featureX
$ hg -R ../review bookmarks
@@ -329,15 +333,17 @@
her change, so now she can publish it.
$ cd ../alice
$ hg --hidden shortlog -G -r 1::
- @ 3:cbdfbd5a5db2 draft fix bug 15 (v2)
+ @ 4:cbdfbd5a5db2 draft fix bug 15 (v2)
|
+ | x 3:55dd95168a35 draft temporary amend commit for f91e97234c2b
+ | |
| x 2:f91e97234c2b draft fix bug 15 (v1)
|/
o 1:de6151c48e1c public fix bug 37
|
~
$ hg outgoing -q ../public
- 3:cbdfbd5a5db2
+ 4:cbdfbd5a5db2
$ hg push ../public
pushing to ../public
searching for changes
@@ -352,21 +358,22 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 2 new obsolescence markers
- new changesets 540ba8f317e6
+ 4 new obsolescence markers
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -G -q -r 'head()'
- o 4:540ba8f317e6
+ o 5:540ba8f317e6
|
~
- @ 3:cbdfbd5a5db2
+ @ 4:cbdfbd5a5db2
|
~
$ hg --hidden shortlog -G -r 1::
- o 4:540ba8f317e6 public implement feature X (v3)
+ o 5:540ba8f317e6 public implement feature X (v3)
|
- | @ 3:cbdfbd5a5db2 draft fix bug 15 (v2)
+ | @ 4:cbdfbd5a5db2 draft fix bug 15 (v2)
|/
+ | x 3:55dd95168a35 draft temporary amend commit for f91e97234c2b
+ | |
| x 2:f91e97234c2b draft fix bug 15 (v1)
|/
o 1:de6151c48e1c public fix bug 37
@@ -376,7 +383,7 @@
Alice rebases her draft changeset on top of Bob's public changeset and
publishes the result.
$ hg rebase -d 5
- rebasing 3:cbdfbd5a5db2 "fix bug 15 (v2)" (bug15)
+ rebasing 4:cbdfbd5a5db2 "fix bug 15 (v2)" (bug15)
$ hg push ../public
pushing to ../public
searching for changes
@@ -384,7 +391,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- 2 new obsolescence markers
+ 3 new obsolescence markers
$ hg push ../review
pushing to ../review
searching for changes
@@ -457,7 +464,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 2fe6c4bd32d0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo 'better fix (alice)' >> file1
$ hg amend -u alice -m 'fix bug 24 (v2 by alice)'
@@ -468,8 +474,10 @@
$ echo 'better fix (bob)' >> file1
$ hg amend -u bob -m 'fix bug 24 (v2 by bob)'
$ hg --hidden shortlog -G -r 3::
- @ 5:a360947f6faf draft fix bug 24 (v2 by bob)
+ @ 6:a360947f6faf draft fix bug 24 (v2 by bob)
|
+ | x 5:3466c7f5a149 draft temporary amend commit for 2fe6c4bd32d0
+ | |
| x 4:2fe6c4bd32d0 draft fix bug 24 (v1)
|/
o 3:a06ec1bf97bd public fix bug 15 (v2)
@@ -484,25 +492,26 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 1 new obsolescence markers
- new changesets e3f99ce9d9cd
+ 2 new obsolescence markers
(run 'hg heads' to see heads, 'hg merge' to merge)
- 2 new content-divergent changesets
+ 2 new divergent changesets
Figure SG09: multiple heads! divergence! oh my!
$ hg --hidden shortlog -G -r 3::
- o 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
+ o 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
|
- | @ 5:a360947f6faf draft fix bug 24 (v2 by bob)
+ | @ 6:a360947f6faf draft fix bug 24 (v2 by bob)
|/
+ | x 5:3466c7f5a149 draft temporary amend commit for 2fe6c4bd32d0
+ | |
| x 4:2fe6c4bd32d0 draft fix bug 24 (v1)
|/
o 3:a06ec1bf97bd public fix bug 15 (v2)
|
~
$ hg --hidden shortlog -r 'successors(2fe6)'
- 5:a360947f6faf draft fix bug 24 (v2 by bob)
- 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
+ 6:a360947f6faf draft fix bug 24 (v2 by bob)
+ 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
Use evolve to fix the divergence.
$ cat > editor.sh <<EOF
@@ -513,30 +522,32 @@
> EOF
$ HGEDITOR='sh ./editor.sh' HGMERGE=internal:other hg evolve --content-divergent
- merge:[5] fix bug 24 (v2 by bob)
- with: [6] fix bug 24 (v2 by alice)
+ merge:[6] fix bug 24 (v2 by bob)
+ with: [7] fix bug 24 (v2 by alice)
base: [4] fix bug 24 (v1)
- merging "other" content-divergent changeset 'e3f99ce9d9cd'
+ merging "other" divergent changeset 'e3f99ce9d9cd'
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
working directory is now at 711ede2d7a26
$ hg log -q -r 'contentdivergent()'
Figure SG10: Bob's repository after fixing divergence.
$ hg --hidden shortlog -G -r 3::
- @ 7:711ede2d7a26 draft fix bug 24 (v2 by bob)
+ @ 8:711ede2d7a26 draft fix bug 24 (v2 by bob)
|
- | x 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
+ | x 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
|/
- | x 5:a360947f6faf draft fix bug 24 (v2 by bob)
+ | x 6:a360947f6faf draft fix bug 24 (v2 by bob)
|/
+ | x 5:3466c7f5a149 draft temporary amend commit for 2fe6c4bd32d0
+ | |
| x 4:2fe6c4bd32d0 draft fix bug 24 (v1)
|/
o 3:a06ec1bf97bd public fix bug 15 (v2)
|
~
$ hg --hidden shortlog -r 'precursors(711ede2d7a26)'
- 5:a360947f6faf draft fix bug 24 (v2 by bob)
- 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
+ 6:a360947f6faf draft fix bug 24 (v2 by bob)
+ 7:e3f99ce9d9cd draft fix bug 24 (v2 by alice)
$ cat file1
Do stuff.
pretty good fix
--- a/tests/test-split.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-split.t Thu Oct 25 16:33:10 2018 +0200
@@ -39,7 +39,8 @@
$ echo "change to a" >> _a
$ hg amend
$ hg debugobsolete
- 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
+ 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob)
+ 06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (*) {'ef1': '0', 'user': 'test'} (glob)
To create commits with the number of split
$ echo 0 > num
@@ -91,16 +92,17 @@
no more change to split
$ hg debugobsolete
- 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
- d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'split', 'user': 'test'}
+ 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
+ 06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
+ d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
$ hg log -G
- @ changeset: 6:033b3f5ae73d
+ @ changeset: 7:033b3f5ae73d
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: split2
|
- o changeset: 5:2d8abdb827cd
+ o changeset: 6:2d8abdb827cd
| parent: 2:52149352b372
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -146,14 +148,14 @@
Split a revision specified with -r
$ echo "change to b" >> _b
$ hg amend -m "_cprim"
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg evolve --all
- move:[5] split1
- atop:[7] _cprim
- move:[6] split2
+ move:[6] split1
+ atop:[9] _cprim
+ move:[7] split2
working directory is now at * (glob)
$ hg log -r "desc(_cprim)" -v -p
- changeset: 7:b434287e665c
+ changeset: 9:b434287e665c
parent: 1:37445b16603b
user: other-test-user
date: Thu Jan 01 00:00:00 1970 +0000
@@ -207,35 +209,37 @@
remaining changes
$ hg debugobsolete
- 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
- d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'split', 'user': 'test'}
- 52149352b372d39b19127d5bd2d488b1b63f9f85 b434287e665ce757ee5463a965cb3d119ca9e893 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
- 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- 033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'split', 'user': 'test'}
+ 1334a80b33c3f9873edab728fbbcf500eab61d2e d2fe56e71366c2c5376c89960c281395062c0619 0 (*) {'ef1': '8', 'user': 'test'} (glob)
+ 06be89dfe2ae447383f30a2984933352757b6fb4 0 {1334a80b33c3f9873edab728fbbcf500eab61d2e} (*) {'ef1': '0', 'user': 'test'} (glob)
+ d2fe56e71366c2c5376c89960c281395062c0619 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b 033b3f5ae73db67c10de938fb6f26b949aaef172 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
+ 52149352b372d39b19127d5bd2d488b1b63f9f85 b434287e665ce757ee5463a965cb3d119ca9e893 0 (*) {'ef1': '9', 'user': 'test'} (glob)
+ 7a4fc25a48a5797bb069563854455aecf738d8f2 0 {52149352b372d39b19127d5bd2d488b1b63f9f85} (*) {'ef1': '0', 'user': 'test'} (glob)
+ 2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
+ 033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
+ b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
$ hg evolve --all
- move:[8] split1
- atop:[11] split4
- move:[9] split2
+ move:[10] split1
+ atop:[13] split4
+ move:[11] split2
working directory is now at d74c6715e706
$ hg log -G
- @ changeset: 13:d74c6715e706
+ @ changeset: 15:d74c6715e706
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: split2
|
- o changeset: 12:3f134f739075
+ o changeset: 14:3f134f739075
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: split1
|
- o changeset: 11:1188c4216eba
+ o changeset: 13:1188c4216eba
| user: other-test-user
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: split4
|
- o changeset: 10:ead2066d1dbf
+ o changeset: 12:ead2066d1dbf
| parent: 1:37445b16603b
| user: other-test-user
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -259,19 +263,19 @@
$ echo "changetofilea" > _a
$ hg amend
$ hg book
- bookA 14:7a6b35779b85
- * bookB 14:7a6b35779b85
- $ hg log -G -r "3f134f739075::"
- @ changeset: 14:7a6b35779b85
+ bookA 17:7a6b35779b85
+ * bookB 17:7a6b35779b85
+ $ hg log -G -r "14::"
+ @ changeset: 17:7a6b35779b85
| bookmark: bookA
| bookmark: bookB
| tag: tip
- | parent: 12:3f134f739075
+ | parent: 14:3f134f739075
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: split2
|
- o changeset: 12:3f134f739075
+ o changeset: 14:3f134f739075
| user: test
~ date: Thu Jan 01 00:00:00 1970 +0000
summary: split1
@@ -302,8 +306,8 @@
created new head
Done splitting? [yN] y
- $ hg log -G -r "3f134f739075::"
- @ changeset: 16:452a26648478
+ $ hg log -G -r "14::"
+ @ changeset: 19:452a26648478
| bookmark: bookA
| bookmark: bookB
| tag: tip
@@ -311,20 +315,20 @@
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: split6
|
- o changeset: 15:1315679b77dc
- | parent: 12:3f134f739075
+ o changeset: 18:1315679b77dc
+ | parent: 14:3f134f739075
| user: victor
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: split5
|
- o changeset: 12:3f134f739075
+ o changeset: 14:3f134f739075
| user: test
~ date: Thu Jan 01 00:00:00 1970 +0000
summary: split1
$ hg book
- bookA 16:452a26648478
- * bookB 16:452a26648478
+ bookA 19:452a26648478
+ * bookB 19:452a26648478
Lastest revision is selected if multiple are given to -r
$ hg split -r "desc(_a)::"
@@ -411,7 +415,7 @@
active topic 'mytopic' grew its first changeset
(see 'hg help topics' for more information)
$ hg log -r .
- changeset: 18:26f72cfaf036
+ changeset: 21:26f72cfaf036
branch: new-branch
tag: tip
topic: mytopic
@@ -420,7 +424,7 @@
summary: Works on mytopic
$ hg summary
- parent: 18:26f72cfaf036 tip
+ parent: 21:26f72cfaf036 tip
Works on mytopic
branch: new-branch
commit: 2 unknown (clean)
@@ -467,15 +471,15 @@
Check that the topic is still here
$ hg log -r "tip~1::"
- changeset: 19:addcf498f19e
+ changeset: 22:addcf498f19e
branch: new-branch
topic: mytopic
- parent: 17:fdb403258632
+ parent: 20:fdb403258632
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: split7
- changeset: 20:2532b288af61
+ changeset: 23:2532b288af61
branch: new-branch
tag: tip
topic: mytopic
@@ -494,7 +498,7 @@
marked working directory as branch another-branch
$ hg commit -m "To be splitted"
$ hg log -G -l 3
- @ changeset: 21:8dad923bdb9b
+ @ changeset: 24:8dad923bdb9b
| branch: another-branch
| tag: tip
| topic: mytopic
@@ -502,17 +506,17 @@
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: To be splitted
|
- o changeset: 20:2532b288af61
+ o changeset: 23:2532b288af61
| branch: new-branch
| topic: mytopic
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: split8
|
- o changeset: 19:addcf498f19e
+ o changeset: 22:addcf498f19e
| branch: new-branch
~ topic: mytopic
- parent: 17:fdb403258632
+ parent: 20:fdb403258632
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: split7
@@ -559,7 +563,7 @@
The splitted changesets should be on the 'another-branch'
$ hg log -G -l 3
- @ changeset: 23:56a59faa8af7
+ @ changeset: 26:56a59faa8af7
| branch: another-branch
| tag: tip
| topic: mytopic
@@ -567,15 +571,15 @@
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: split10
|
- o changeset: 22:75695e3e2300
+ o changeset: 25:75695e3e2300
| branch: another-branch
| topic: mytopic
- | parent: 20:2532b288af61
+ | parent: 23:2532b288af61
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: split9
|
- o changeset: 20:2532b288af61
+ o changeset: 23:2532b288af61
| branch: new-branch
~ topic: mytopic
user: test
@@ -595,7 +599,7 @@
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ hg log -G -l 2
- o changeset: 24:b1020d17c364
+ o changeset: 27:b1020d17c364
| branch: yet-another-branch
| tag: tip
| topic: mytopic
@@ -603,7 +607,7 @@
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: To be splitted again
|
- @ changeset: 23:56a59faa8af7
+ @ changeset: 26:56a59faa8af7
| branch: another-branch
~ topic: mytopic
user: test
@@ -635,7 +639,7 @@
another-branch
$ hg log -G -l 2
- o changeset: 24:b1020d17c364
+ o changeset: 27:b1020d17c364
| branch: yet-another-branch
| tag: tip
| topic: mytopic
@@ -643,7 +647,7 @@
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: To be splitted again
|
- @ changeset: 23:56a59faa8af7
+ @ changeset: 26:56a59faa8af7
| branch: another-branch
~ topic: mytopic
user: test
--- a/tests/test-stabilize-conflict.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-stabilize-conflict.t Thu Oct 25 16:33:10 2018 +0200
@@ -76,21 +76,21 @@
neuf
dix
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg evolve
move:[2] babar count up to fifteen
- atop:[3] babar count up to ten
+ atop:[4] babar count up to ten
merging babar
working directory is now at 71c18f70c34f
$ hg resolve -l
$ hg log -G
- @ changeset: 4:71c18f70c34f
+ @ changeset: 5:71c18f70c34f
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: babar count up to fifteen
|
- o changeset: 3:5977072d13c5
+ o changeset: 4:5977072d13c5
| parent: 0:29ec1554cfaf
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -109,12 +109,12 @@
$ hg gdown
gdown have been deprecated in favor of previous
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- [3] babar count up to ten
+ [4] babar count up to ten
$ safesed 's/dix/ten/' babar
$ hg diff
diff -r 5977072d13c5 babar
--- a/babar Thu Jan 01 00:00:00 1970 +0000
- +++ b/babar Thu Jan 01 00:00:00 1970 +0000
+ +++ b/babar * (glob)
@@ -7,4 +7,4 @@
sept
eight
@@ -122,10 +122,10 @@
-dix
+ten
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg evolve
- move:[4] babar count up to fifteen
- atop:[5] babar count up to ten
+ move:[5] babar count up to fifteen
+ atop:[7] babar count up to ten
merging babar
warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -133,24 +133,24 @@
$ hg resolve -l
U babar
$ hg log -G
- @ changeset: 5:e04690b09bc6
+ @ changeset: 7:e04690b09bc6
| tag: tip
| parent: 0:29ec1554cfaf
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: babar count up to ten
|
- | @ changeset: 4:71c18f70c34f
+ | @ changeset: 5:71c18f70c34f
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan
+ | | trouble: unstable
| | summary: babar count up to fifteen
| |
- | x changeset: 3:5977072d13c5
+ | x changeset: 4:5977072d13c5
|/ parent: 0:29ec1554cfaf
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: amended using amend as 5:e04690b09bc6
+ | obsolete: amended as e04690b09bc6
| summary: babar count up to ten
|
o changeset: 0:29ec1554cfaf
@@ -160,24 +160,24 @@
(fix the conflict and continue)
- $ hg revert -r 71c18f70c34f --all
+ $ hg revert -r 5 --all
reverting babar
$ safesed 's/dix/ten/' babar
$ hg resolve --all -m
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- evolving 4:71c18f70c34f "babar count up to fifteen"
+ evolving 5:71c18f70c34f "babar count up to fifteen"
working directory is now at 1836b91c6c1d
$ hg resolve -l
$ hg log -G
- @ changeset: 6:1836b91c6c1d
+ @ changeset: 8:1836b91c6c1d
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: babar count up to fifteen
|
- o changeset: 5:e04690b09bc6
+ o changeset: 7:e04690b09bc6
| parent: 0:29ec1554cfaf
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -196,12 +196,12 @@
$ hg gdown
gdown have been deprecated in favor of previous
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- [5] babar count up to ten
+ [7] babar count up to ten
$ safesed 's/ten/zehn/' babar
$ hg diff
diff -r e04690b09bc6 babar
--- a/babar Thu Jan 01 00:00:00 1970 +0000
- +++ b/babar Thu Jan 01 00:00:00 1970 +0000
+ +++ b/babar * (glob)
@@ -7,4 +7,4 @@
sept
eight
@@ -209,13 +209,13 @@
-ten
+zehn
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ safesed 's/interactive=.*/interactive=true/' $HGRCPATH
$ hg evolve --tool touch <<EOF
> n
> EOF
- move:[6] babar count up to fifteen
- atop:[7] babar count up to ten
+ move:[8] babar count up to fifteen
+ atop:[10] babar count up to ten
merging babar
output file babar appears unchanged
was merge successful (yn)? n
@@ -225,24 +225,24 @@
$ hg resolve -l
U babar
$ hg log -G
- @ changeset: 7:b20d08eea373
+ @ changeset: 10:b20d08eea373
| tag: tip
| parent: 0:29ec1554cfaf
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: babar count up to ten
|
- | @ changeset: 6:1836b91c6c1d
+ | @ changeset: 8:1836b91c6c1d
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan
+ | | trouble: unstable
| | summary: babar count up to fifteen
| |
- | x changeset: 5:e04690b09bc6
+ | x changeset: 7:e04690b09bc6
|/ parent: 0:29ec1554cfaf
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: amended using amend as 7:b20d08eea373
+ | obsolete: amended as b20d08eea373
| summary: babar count up to ten
|
o changeset: 0:29ec1554cfaf
--- a/tests/test-stabilize-order.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-stabilize-order.t Thu Oct 25 16:33:10 2018 +0200
@@ -38,18 +38,18 @@
[2] addb
$ echo b >> b
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg gdown
gdown have been deprecated in favor of previous
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[1] adda
$ echo a >> a
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ glog
- @ 5:005fe5914f78@default(draft) adda
+ @ 7:005fe5914f78@default(draft) adda
|
- | o 4:22619daeed78@default(draft) addb
+ | o 5:22619daeed78@default(draft) addb
| |
| | o 3:7a7552255fb5@default(draft) addc
| | |
@@ -63,8 +63,8 @@
Test stabilizing a predecessor child
$ hg evolve -v
- move:[4] addb
- atop:[5] adda
+ move:[5] addb
+ atop:[7] adda
hg rebase -r 22619daeed78 -d 005fe5914f78
resolving manifests
getting b
@@ -74,9 +74,9 @@
committing changelog
working directory is now at 81b8bbcd5892
$ glog
- @ 6:81b8bbcd5892@default(draft) addb
+ @ 8:81b8bbcd5892@default(draft) addb
|
- o 5:005fe5914f78@default(draft) adda
+ o 7:005fe5914f78@default(draft) adda
|
| o 3:7a7552255fb5@default(draft) addc
| |
@@ -89,12 +89,12 @@
Test stabilizing a descendant predecessor's child
- $ hg up -r 005fe5914f78
+ $ hg up 7
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg debugobsolete > successors.old
$ hg evolve -v
move:[3] addc
- atop:[6] addb
+ atop:[8] addb
hg rebase -r 7a7552255fb5 -d 81b8bbcd5892
resolving manifests
getting b
@@ -109,21 +109,21 @@
$ diff -u successors.old successors.new
--- successors.old* (glob)
+++ successors.new* (glob)
- @@ -1,3 +1,4 @@
- ef23d6ef94d68dea65d20587dfecc8b33d165617 22619daeed78036f80fbd326b6852519c4f0c25e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
- 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'}
- 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
- +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
+ @@ -3,3 +3,4 @@
+ 93418d2c0979643ad446f621195e78720edb05b4 005fe5914f78e8bc64c7eba28117b0b1fa210d0d 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ 7a7d76dc97c57751de9e80f61ed2a639bd03cd24 0 {93418d2c0979643ad446f621195e78720edb05b4} (*) {'ef1': '*', 'user': 'test'} (glob)
+ 22619daeed78036f80fbd326b6852519c4f0c25e 81b8bbcd5892841efed41433d7a5e9df922396cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
+ +7a7552255fb5f8bd745e46fba6f0ca633a4dd716 0f691739f91762462bf8ba21f35fdf71fe64310e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'user': 'test'}
[1]
$ glog
- @ 7:0f691739f917@default(draft) addc
+ @ 9:0f691739f917@default(draft) addc
|
- o 6:81b8bbcd5892@default(draft) addb
+ o 8:81b8bbcd5892@default(draft) addb
|
- o 5:005fe5914f78@default(draft) adda
+ o 7:005fe5914f78@default(draft) adda
|
o 0:c471ef929e6a@default(draft) addroot
@@ -132,31 +132,32 @@
Test behavior with --any
- $ hg up 81b8bbcd5892
+ $ hg up 8
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo b >> b
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ glog
- @ 8:7a68bc4596ea@default(draft) addb
+ @ 11:7a68bc4596ea@default(draft) addb
|
- | o 7:0f691739f917@default(draft) addc
+ | o 9:0f691739f917@default(draft) addc
| |
- | x 6:81b8bbcd5892@default(draft) addb
+ | x 8:81b8bbcd5892@default(draft) addb
|/
- o 5:005fe5914f78@default(draft) adda
+ o 7:005fe5914f78@default(draft) adda
|
o 0:c471ef929e6a@default(draft) addroot
- $ hg up 0f691739f917
+| |
+ $ hg up 9
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg evolve -v
nothing to evolve on current working copy parent
(1 other orphan in the repository, do you want --any or --rev)
[2]
$ hg evolve --any -v
- move:[7] addc
- atop:[8] addb
+ move:[9] addc
+ atop:[11] addb
hg rebase -r 0f691739f917 -d 7a68bc4596ea
resolving manifests
removing c
@@ -169,11 +170,11 @@
committing changelog
working directory is now at 2256dae6521f
$ glog
- @ 9:2256dae6521f@default(draft) addc
+ @ 12:2256dae6521f@default(draft) addc
|
- o 8:7a68bc4596ea@default(draft) addb
+ o 11:7a68bc4596ea@default(draft) addb
|
- o 5:005fe5914f78@default(draft) adda
+ o 7:005fe5914f78@default(draft) adda
|
o 0:c471ef929e6a@default(draft) addroot
@@ -194,41 +195,41 @@
$ hg up .^
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg commit --amend -m "newmessage"
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg log -G
- @ changeset: 12:f83a0bce03e4
+ @ changeset: 15:f83a0bce03e4
| tag: tip
- | parent: 8:7a68bc4596ea
+ | parent: 11:7a68bc4596ea
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: newmessage
|
- | o changeset: 11:fa68011f392e
- | | parent: 9:2256dae6521f
+ | o changeset: 14:fa68011f392e
+ | | parent: 12:2256dae6521f
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan
+ | | trouble: unstable
| | summary: secondambiguous
| |
- | | o changeset: 10:bdc003b6eec2
+ | | o changeset: 13:bdc003b6eec2
| |/ user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan
+ | | trouble: unstable
| | summary: firstambiguous
| |
- | x changeset: 9:2256dae6521f
+ | x changeset: 12:2256dae6521f
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 12:f83a0bce03e4
+ | obsolete: reworded as f83a0bce03e4
| summary: addc
|
- o changeset: 8:7a68bc4596ea
- | parent: 5:005fe5914f78
+ o changeset: 11:7a68bc4596ea
+ | parent: 7:005fe5914f78
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: addb
|
- o changeset: 5:005fe5914f78
+ o changeset: 7:005fe5914f78
| parent: 0:c471ef929e6a
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
--- a/tests/test-stabilize-result.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-stabilize-result.t Thu Oct 25 16:33:10 2018 +0200
@@ -27,33 +27,36 @@
(leaving bookmark changea)
$ echo a >> a
$ hg amend -m changea
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg evolve -v --confirm
move:[2] changea
- atop:[3] changea
+ atop:[4] changea
perform evolve? [Ny] n
abort: evolve aborted by user
[255]
$ echo y | hg evolve -v --confirm --config ui.interactive=True
move:[2] changea
- atop:[3] changea
+ atop:[4] changea
perform evolve? [Ny] y
hg rebase -r cce2c55b8965 -d fb9d051ec0a4
resolving manifests
evolution of 2:cce2c55b8965 created no changes to commit
$ glog --hidden
- @ 3:fb9d051ec0a4@default(draft) bk:[changea] changea
+ @ 4:fb9d051ec0a4@default(draft) bk:[changea] changea
|
- | x 2:cce2c55b8965@default(draft) bk:[] changea
+ | x 3:c5727dbded3c@default(draft) bk:[] temporary amend commit for 102a90ea7b4a
| |
+ | | x 2:cce2c55b8965@default(draft) bk:[] changea
+ | |/
| x 1:102a90ea7b4a@default(draft) bk:[] addb
|/
o 0:07f494440405@default(draft) bk:[] adda
$ hg debugobsolete
- 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
- cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'}
+ 102a90ea7b4a3361e4082ed620918c261189a36a fb9d051ec0a450a4aa2ffc8c324979832ef88065 0 (*) {'ef1': '*', 'user': 'test'} (glob)
+ c5727dbded3c3a6877cf60d6bb552a76812cb844 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (*) {'ef1': '*', 'user': 'test'} (glob)
+ cce2c55b896511e0b6e04173c9450ba822ebc740 0 {102a90ea7b4a3361e4082ed620918c261189a36a} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'user': 'test'}
Test evolve with conflict
@@ -72,13 +75,13 @@
$ hg gdown
gdown have been deprecated in favor of previous
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- [3] changea
+ [4] changea
$ echo 'a' > a
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg evolve
- move:[4] newer a
- atop:[5] changea
+ move:[5] newer a
+ atop:[7] changea
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
fix conflicts and see `hg help evolve.interrupted`
@@ -93,14 +96,14 @@
+a
+newer a
$ hg evolve --continue
- evolving 4:3655f0f50885 "newer a"
+ evolving 5:3655f0f50885 "newer a"
abort: unresolved merge conflicts (see 'hg help resolve')
[255]
$ hg resolve -m a
(no more unresolved files)
continue: hg evolve --continue
$ hg evolve --continue
- evolving 4:3655f0f50885 "newer a"
+ evolving 5:3655f0f50885 "newer a"
working directory is now at 1cf0aacfd363
Stabilize latecomer with different parent
@@ -109,9 +112,9 @@
(the same-parent case is handled in test-evolve.t)
$ glog
- @ 6:1cf0aacfd363@default(draft) bk:[] newer a
+ @ 8:1cf0aacfd363@default(draft) bk:[] newer a
|
- o 5:66719795a494@default(draft) bk:[changea] changea
+ o 7:66719795a494@default(draft) bk:[changea] changea
|
o 0:07f494440405@default(draft) bk:[] adda
@@ -120,7 +123,7 @@
$ hg gdown
gdown have been deprecated in favor of previous
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- [5] changea
+ [7] changea
$ echo 'c' > c
$ hg add c
$ hg commit -m 'add c'
@@ -129,7 +132,7 @@
Get a successors of 8 on it
$ hg pick 1cf0aacfd363
- picking 6:1cf0aacfd363 "newer a"
+ picking 8:1cf0aacfd363 "newer a"
Add real change to the successors
@@ -139,15 +142,15 @@
Make precursors public
$ hg phase --hidden --public 1cf0aacfd363
- 1 new phase-divergent changesets
+ 1 new bumped changesets
$ glog
- @ 9:99c21c89bcef@default(draft) bk:[] newer a
+ @ 12:99c21c89bcef@default(draft) bk:[] newer a
|
- o 7:7bc2f5967f5e@default(draft) bk:[] add c
+ o 9:7bc2f5967f5e@default(draft) bk:[] add c
|
- | o 6:1cf0aacfd363@default(public) bk:[] newer a
+ | o 8:1cf0aacfd363@default(public) bk:[] newer a
|/
- o 5:66719795a494@default(public) bk:[changea] changea
+ o 7:66719795a494@default(public) bk:[changea] changea
|
o 0:07f494440405@default(public) bk:[] adda
@@ -155,34 +158,34 @@
Stabilize!
$ hg evolve --any --dry-run --phase-divergent
- recreate:[9] newer a
- atop:[6] newer a
+ recreate:[12] newer a
+ atop:[8] newer a
hg rebase --rev 99c21c89bcef --dest 66719795a494;
hg update 1cf0aacfd363;
hg revert --all --rev 99c21c89bcef;
- hg commit --msg "phase-divergent update to 99c21c89bcef"
+ hg commit --msg "bumped update to 99c21c89bcef"
$ hg evolve --any --confirm --phase-divergent
- recreate:[9] newer a
- atop:[6] newer a
+ recreate:[12] newer a
+ atop:[8] newer a
perform evolve? [Ny] n
abort: evolve aborted by user
[255]
$ echo y | hg evolve --any --confirm --config ui.interactive=True --phase-divergent
- recreate:[9] newer a
- atop:[6] newer a
+ recreate:[12] newer a
+ atop:[8] newer a
perform evolve? [Ny] y
rebasing to destination parent: 66719795a494
computing new diff
- committed as 8fc63fe1f297
- working directory is now at 8fc63fe1f297
+ committed as cd735a3aeb32
+ working directory is now at cd735a3aeb32
$ glog
- @ 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+ @ 14:cd735a3aeb32@default(draft) bk:[] bumped update to 1cf0aacfd363:
|
- | o 7:7bc2f5967f5e@default(draft) bk:[] add c
+ | o 9:7bc2f5967f5e@default(draft) bk:[] add c
| |
- o | 6:1cf0aacfd363@default(public) bk:[] newer a
+ o | 8:1cf0aacfd363@default(public) bk:[] newer a
|/
- o 5:66719795a494@default(public) bk:[changea] changea
+ o 7:66719795a494@default(public) bk:[changea] changea
|
o 0:07f494440405@default(public) bk:[] adda
@@ -191,13 +194,13 @@
# User test
# Date 0 0
# Thu Jan 01 00:00:00 1970 +0000
- # Node ID 8fc63fe1f297f356d1156bbbbe865b9911efad74
+ # Node ID cd735a3aeb32e80b92f780c4ace1650597d581b2
# Parent 1cf0aacfd36310b18e403e1594871187e0364a82
- phase-divergent update to 1cf0aacfd363:
+ bumped update to 1cf0aacfd363:
newer a
- diff -r 1cf0aacfd363 -r 8fc63fe1f297 a
+ diff -r 1cf0aacfd363 -r cd735a3aeb32 a
--- a/a Thu Jan 01 00:00:00 1970 +0000
+++ b/a Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +1,4 @@
@@ -222,15 +225,15 @@
> EOF
$ hg ci -m 'More addition'
$ glog
- @ 12:3932c176bbaa@default(draft) bk:[] More addition
+ @ 15:3932c176bbaa@default(draft) bk:[] More addition
|
- | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+ | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
| |
- o | 7:7bc2f5967f5e@default(draft) bk:[] add c
+ o | 9:7bc2f5967f5e@default(draft) bk:[] add c
| |
- | o 6:1cf0aacfd363@default(public) bk:[] newer a
+ | o 8:1cf0aacfd363@default(public) bk:[] newer a
|/
- o 5:66719795a494@default(public) bk:[changea] changea
+ o 7:66719795a494@default(public) bk:[changea] changea
|
o 0:07f494440405@default(public) bk:[] adda
@@ -245,19 +248,19 @@
$ cat a.old >> a
$ rm a.old
$ hg amend
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ glog
- @ 14:eacc9c8240fe@default(draft) bk:[] More addition
+ @ 19:eacc9c8240fe@default(draft) bk:[] More addition
|
- | o 13:d2f173e25686@default(draft) bk:[] More addition
+ | o 17:d2f173e25686@default(draft) bk:[] More addition
|/
- | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+ | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
| |
- o | 7:7bc2f5967f5e@default(draft) bk:[] add c
+ o | 9:7bc2f5967f5e@default(draft) bk:[] add c
| |
- | o 6:1cf0aacfd363@default(public) bk:[] newer a
+ | o 8:1cf0aacfd363@default(public) bk:[] newer a
|/
- o 5:66719795a494@default(public) bk:[changea] changea
+ o 7:66719795a494@default(public) bk:[changea] changea
|
o 0:07f494440405@default(public) bk:[] adda
@@ -265,16 +268,16 @@
Stabilize it
$ hg evolve -qn --confirm --content-divergent
- merge:[14] More addition
- with: [13] More addition
- base: [12] More addition
+ merge:[19] More addition
+ with: [17] More addition
+ base: [15] More addition
perform evolve? [Ny] n
abort: evolve aborted by user
[255]
$ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent
- merge:[14] More addition
- with: [13] More addition
- base: [12] More addition
+ merge:[19] More addition
+ with: [17] More addition
+ base: [15] More addition
perform evolve? [Ny] y
hg update -c eacc9c8240fe &&
hg merge d2f173e25686 &&
@@ -283,10 +286,10 @@
hg revert --all --rev tip &&
hg commit -m "`hg log -r eacc9c8240fe --template={desc}`";
$ hg evolve -v --content-divergent
- merge:[14] More addition
- with: [13] More addition
- base: [12] More addition
- merging "other" content-divergent changeset 'd2f173e25686'
+ merge:[19] More addition
+ with: [17] More addition
+ base: [15] More addition
+ merging "other" divergent changeset 'd2f173e25686'
resolving manifests
merging a
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
@@ -297,20 +300,20 @@
working directory is now at 4d6ed26797bc
$ hg st
$ glog
- @ 15:4d6ed26797bc@default(draft) bk:[] More addition
+ | o 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re)
|
- | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+ | o 14:cd735a3aeb32@default(draft) bk:[] bumped update to 1cf0aacfd363:
| |
- o | 7:7bc2f5967f5e@default(draft) bk:[] add c
+ o | 9:7bc2f5967f5e@default(draft) bk:[] add c
| |
- | o 6:1cf0aacfd363@default(public) bk:[] newer a
+ | o 8:1cf0aacfd363@default(public) bk:[] newer a
|/
- o 5:66719795a494@default(public) bk:[changea] changea
+ o 7:66719795a494@default(public) bk:[changea] changea
|
o 0:07f494440405@default(public) bk:[] adda
$ hg summary
- parent: 15:4d6ed26797bc tip
+ parent: 20:4d6ed26797bc tip
More addition
branch: default
commit: (clean)
@@ -348,25 +351,25 @@
(use 'hg evolve' to update to its successor: 4d6ed26797bc)
$ echo 'gotta break' >> a
$ hg amend
- 2 new content-divergent changesets
+ 2 new divergent changesets
# reamend so that the case is not the first precursor.
$ hg amend -m "More addition (2)"
$ hg phase 'contentdivergent()'
- 15: draft
- 17: draft
+ 20: draft
+ 23: draft
$ glog
- @ 17:0b336205a5d0@default(draft) bk:[] More addition (2)
+ @ 23:0b336205a5d0@default(draft) bk:[] More addition (2)
|
- | o 15:4d6ed26797bc@default(draft) bk:[] More addition
+ | o 20:4d6ed26797bc@default(draft) bk:[] More addition
|/
- | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+ | o 14:cd735a3aeb32@default(draft) bk:[] bumped update to 1cf0aacfd363:
| |
- o | 7:7bc2f5967f5e@default(draft) bk:[] add c
+ o | 9:7bc2f5967f5e@default(draft) bk:[] add c
| |
- | o 6:1cf0aacfd363@default(public) bk:[] newer a
+ | o 8:1cf0aacfd363@default(public) bk:[] newer a
|/
- o 5:66719795a494@default(public) bk:[changea] changea
+ o 7:66719795a494@default(public) bk:[changea] changea
|
o 0:07f494440405@default(public) bk:[] adda
@@ -379,10 +382,10 @@
hg revert --all --rev tip &&
hg commit -m "`hg log -r 0b336205a5d0 --template={desc}`";
$ hg evolve --content-divergent
- merge:[17] More addition (2)
- with: [15] More addition
- base: [12] More addition
- merging "other" content-divergent changeset '4d6ed26797bc'
+ merge:[23] More addition (2)
+ with: [20] More addition
+ base: [15] More addition
+ merging "other" divergent changeset '4d6ed26797bc'
merging a
warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
@@ -407,15 +410,15 @@
$ hg evolve --continue
working directory is now at e8746835a2a1
$ glog
- @ 18:e8746835a2a1@default(draft) bk:[] More addition (2)
+ @ 24:e8746835a2a1@default(draft) bk:[] More addition (2)
|
- | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363:
+ | o 14:cd735a3aeb32@default(draft) bk:[] bumped update to 1cf0aacfd363:
| |
- o | 7:7bc2f5967f5e@default(draft) bk:[] add c
+ o | 9:7bc2f5967f5e@default(draft) bk:[] add c
| |
- | o 6:1cf0aacfd363@default(public) bk:[] newer a
+ | o 8:1cf0aacfd363@default(public) bk:[] newer a
|/
- o 5:66719795a494@default(public) bk:[changea] changea
+ o 7:66719795a494@default(public) bk:[changea] changea
|
o 0:07f494440405@default(public) bk:[] adda
--- a/tests/test-stablesort-branchpoint-criss-cross.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-stablesort-branchpoint-criss-cross.t Thu Oct 25 16:33:10 2018 +0200
@@ -704,7 +704,6 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd crisscross_random
--- a/tests/test-stablesort-branchpoint.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-stablesort-branchpoint.t Thu Oct 25 16:33:10 2018 +0200
@@ -162,7 +162,6 @@
adding manifests
adding file changes
added 4 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:f0f3ef9a6cd5
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo_B pull --rev 13
@@ -172,7 +171,6 @@
adding manifests
adding file changes
added 4 changesets with 0 changes to 0 files (+1 heads)
- new changesets 66f7d451a68b:b4594d867745
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R repo_B pull --rev 14
pulling from $TESTTMP/repo_A (glob)
@@ -181,7 +179,6 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
- new changesets 43227190fef8
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R repo_B pull
pulling from $TESTTMP/repo_A (glob)
@@ -190,7 +187,6 @@
adding manifests
adding file changes
added 7 changesets with 0 changes to 0 files (+3 heads)
- new changesets 2702dd0c91e7:1d8d22637c2d
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R repo_B log -G
o 15 1d8d22637c2d r15 tip
@@ -249,7 +245,6 @@
adding manifests
adding file changes
added 7 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:ff43616e5d0f
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo_C pull --rev 12
@@ -259,7 +254,6 @@
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files (+1 heads)
- new changesets bab5d5bf48bd:e46a4836065c
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R repo_C pull --rev 15
pulling from $TESTTMP/repo_A (glob)
@@ -268,7 +262,6 @@
adding manifests
adding file changes
added 4 changesets with 0 changes to 0 files (+1 heads)
- new changesets 4c748ffd1a46:1d8d22637c2d
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R repo_C pull
pulling from $TESTTMP/repo_A (glob)
@@ -277,7 +270,6 @@
adding manifests
adding file changes
added 3 changesets with 0 changes to 0 files (+3 heads)
- new changesets 2702dd0c91e7:b4594d867745
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R repo_C log -G
o 15 b4594d867745 r13 tip
@@ -319,7 +311,6 @@
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:fa942426a6fd
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo_D pull --rev 10
@@ -329,7 +320,6 @@
adding manifests
adding file changes
added 5 changesets with 0 changes to 0 files
- new changesets 66f7d451a68b:ff43616e5d0f
(run 'hg update' to get a working copy)
$ hg -R repo_D pull --rev 15
pulling from $TESTTMP/repo_A (glob)
@@ -338,7 +328,6 @@
adding manifests
adding file changes
added 4 changesets with 0 changes to 0 files (+1 heads)
- new changesets 4c748ffd1a46:1d8d22637c2d
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R repo_D pull
pulling from $TESTTMP/repo_A (glob)
@@ -347,7 +336,6 @@
adding manifests
adding file changes
added 5 changesets with 0 changes to 0 files (+4 heads)
- new changesets 2702dd0c91e7:b4594d867745
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R repo_D log -G
o 15 b4594d867745 r13 tip
@@ -457,7 +445,6 @@
adding manifests
adding file changes
added 5 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:43227190fef8
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo_E pull --rev e7d9710d9fc6
@@ -467,7 +454,6 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
- new changesets e7d9710d9fc6
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg clone repo_A repo_F --rev "1d8d22637c2d"
@@ -475,7 +461,6 @@
adding manifests
adding file changes
added 8 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:1d8d22637c2d
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo_F pull --rev d62d843c9a01
@@ -485,7 +470,6 @@
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files (+1 heads)
- new changesets e7d9710d9fc6:d62d843c9a01
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg clone repo_A repo_G --rev "e7d9710d9fc6"
@@ -493,7 +477,6 @@
adding manifests
adding file changes
added 5 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:e7d9710d9fc6
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo_G pull --rev 43227190fef8
@@ -503,7 +486,6 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
- new changesets 43227190fef8
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R repo_G pull --rev 2702dd0c91e7
pulling from $TESTTMP/repo_A (glob)
@@ -512,7 +494,6 @@
adding manifests
adding file changes
added 3 changesets with 0 changes to 0 files (+1 heads)
- new changesets 4c748ffd1a46:2702dd0c91e7
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ for x in E F G; do
@@ -663,7 +644,6 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd recursion_random
--- a/tests/test-stablesort-criss-cross.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-stablesort-criss-cross.t Thu Oct 25 16:33:10 2018 +0200
@@ -816,7 +816,6 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd crisscross_random
--- a/tests/test-stablesort.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-stablesort.t Thu Oct 25 16:33:10 2018 +0200
@@ -235,7 +235,6 @@
adding manifests
adding file changes
added 4 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:f0f3ef9a6cd5
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo_B pull --rev 13
@@ -245,7 +244,6 @@
adding manifests
adding file changes
added 4 changesets with 0 changes to 0 files (+1 heads)
- new changesets 66f7d451a68b:b4594d867745
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R repo_B pull --rev 14
pulling from $TESTTMP/repo_A (glob)
@@ -254,7 +252,6 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
- new changesets 43227190fef8
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R repo_B pull
pulling from $TESTTMP/repo_A (glob)
@@ -263,7 +260,6 @@
adding manifests
adding file changes
added 7 changesets with 0 changes to 0 files (+3 heads)
- new changesets 2702dd0c91e7:1d8d22637c2d
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R repo_B log -G
o 15 1d8d22637c2d r15 tip
@@ -322,7 +318,6 @@
adding manifests
adding file changes
added 7 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:ff43616e5d0f
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo_C pull --rev 12
@@ -332,7 +327,6 @@
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files (+1 heads)
- new changesets bab5d5bf48bd:e46a4836065c
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R repo_C pull --rev 15
pulling from $TESTTMP/repo_A (glob)
@@ -341,7 +335,6 @@
adding manifests
adding file changes
added 4 changesets with 0 changes to 0 files (+1 heads)
- new changesets 4c748ffd1a46:1d8d22637c2d
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R repo_C pull
pulling from $TESTTMP/repo_A (glob)
@@ -350,7 +343,6 @@
adding manifests
adding file changes
added 3 changesets with 0 changes to 0 files (+3 heads)
- new changesets 2702dd0c91e7:b4594d867745
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R repo_C log -G
o 15 b4594d867745 r13 tip
@@ -392,7 +384,6 @@
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:fa942426a6fd
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo_D pull --rev 10
@@ -402,7 +393,6 @@
adding manifests
adding file changes
added 5 changesets with 0 changes to 0 files
- new changesets 66f7d451a68b:ff43616e5d0f
(run 'hg update' to get a working copy)
$ hg -R repo_D pull --rev 15
pulling from $TESTTMP/repo_A (glob)
@@ -411,7 +401,6 @@
adding manifests
adding file changes
added 4 changesets with 0 changes to 0 files (+1 heads)
- new changesets 4c748ffd1a46:1d8d22637c2d
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R repo_D pull
pulling from $TESTTMP/repo_A (glob)
@@ -420,7 +409,6 @@
adding manifests
adding file changes
added 5 changesets with 0 changes to 0 files (+4 heads)
- new changesets 2702dd0c91e7:b4594d867745
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ hg -R repo_D log -G
o 15 b4594d867745 r13 tip
@@ -549,7 +537,6 @@
adding manifests
adding file changes
added 5 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:43227190fef8
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo_E pull --rev e7d9710d9fc6
@@ -559,7 +546,6 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
- new changesets e7d9710d9fc6
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg clone repo_A repo_F --rev "1d8d22637c2d"
@@ -567,7 +553,6 @@
adding manifests
adding file changes
added 8 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:1d8d22637c2d
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo_F pull --rev d62d843c9a01
@@ -577,7 +562,6 @@
adding manifests
adding file changes
added 2 changesets with 0 changes to 0 files (+1 heads)
- new changesets e7d9710d9fc6:d62d843c9a01
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg clone repo_A repo_G --rev "e7d9710d9fc6"
@@ -585,7 +569,6 @@
adding manifests
adding file changes
added 5 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b:e7d9710d9fc6
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R repo_G pull --rev 43227190fef8
@@ -595,7 +578,6 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
- new changesets 43227190fef8
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R repo_G pull --rev 2702dd0c91e7
pulling from $TESTTMP/repo_A (glob)
@@ -604,7 +586,6 @@
adding manifests
adding file changes
added 3 changesets with 0 changes to 0 files (+1 heads)
- new changesets 4c748ffd1a46:2702dd0c91e7
(run 'hg heads .' to see heads, 'hg merge' to merge)
$ for x in E F G; do
@@ -818,7 +799,6 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files
- new changesets 1ea73414a91b
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd recursion_random
--- a/tests/test-stack-branch.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-stack-branch.t Thu Oct 25 16:33:10 2018 +0200
@@ -110,7 +110,7 @@
$ echo bbb > ddd
$ hg commit --amend
$ hg log -G
- @ 6 foo {} draft c_d
+ @ 7 foo {} draft c_d
|
| o 5 foo {} draft c_f
| |
@@ -147,7 +147,7 @@
$ hg log -r 'stack()'
2 foo {} draft c_c
- 6 foo {} draft c_d
+ 7 foo {} draft c_d
4 foo {} draft c_e
5 foo {} draft c_f
@@ -160,11 +160,11 @@
rebasing 4:4f2a69f6d380 "c_e"
rebasing 5:913c298d8b0a "c_f"
$ hg log -G
- o 8 foo {} draft c_f
+ o 9 foo {} draft c_f
|
- o 7 foo {} draft c_e
+ o 8 foo {} draft c_e
|
- @ 6 foo {} draft c_d
+ @ 7 foo {} draft c_d
|
o 2 foo {} draft c_c
|
@@ -186,15 +186,15 @@
$ hg add hhh
$ hg commit -m c_h
$ hg log -G
- @ 10 foo {} draft c_h
+ @ 11 foo {} draft c_h
|
- o 9 foo {} draft c_g
+ o 10 foo {} draft c_g
|
- | o 8 foo {} draft c_f
+ | o 9 foo {} draft c_f
| |
- | o 7 foo {} draft c_e
+ | o 8 foo {} draft c_e
|/
- o 6 foo {} draft c_d
+ o 7 foo {} draft c_d
|
o 2 foo {} draft c_c
|
@@ -207,11 +207,11 @@
$ hg stack
### target: foo (branch) (2 heads)
- s6@ c_h (current)
- s5: c_g
+ s6: c_f
+ s5: c_e
s2^ c_d (base)
- s4: c_f
- s3: c_e
+ s4@ c_h (current)
+ s3: c_g
s2: c_d
s1: c_c
s0^ c_b (base)
@@ -226,20 +226,20 @@
$ echo ccc > ddd
$ hg commit --amend -m 'c_D'
$ hg rebase -d . -s 'desc(c_g)'
- rebasing 9:2ebb6e48ab8a "c_g"
- rebasing 10:634f38e27a1d "c_h"
+ rebasing 10:2ebb6e48ab8a "c_g"
+ rebasing 11:634f38e27a1d "c_h"
$ hg log -G
- o 13 foo {} draft c_h
+ o 15 foo {} draft c_h
|
- o 12 foo {} draft c_g
+ o 14 foo {} draft c_g
|
- @ 11 foo {} draft c_D
+ @ 13 foo {} draft c_D
|
- | o 8 foo {} draft c_f
+ | o 9 foo {} draft c_f
| |
- | o 7 foo {} draft c_e
+ | o 8 foo {} draft c_e
| |
- | x 6 foo {} draft c_d
+ | x 7 foo {} draft c_d
|/
o 2 foo {} draft c_c
|
@@ -250,11 +250,11 @@
$ hg stack
### target: foo (branch) (2 heads)
- s6: c_h
- s5: c_g
+ s6$ c_f (unstable)
+ s5$ c_e (unstable)
s2^ c_D (base current)
- s4$ c_f (unstable)
- s3$ c_e (unstable)
+ s4: c_h
+ s3: c_g
s2@ c_D (current)
s1: c_c
s0^ c_b (base)
@@ -263,17 +263,17 @@
----------------------------------------------------------
$ hg log --graph
- o 13 foo {} draft c_h
+ o 15 foo {} draft c_h
|
- o 12 foo {} draft c_g
+ o 14 foo {} draft c_g
|
- @ 11 foo {} draft c_D
+ @ 13 foo {} draft c_D
|
- | o 8 foo {} draft c_f
+ | o 9 foo {} draft c_f
| |
- | o 7 foo {} draft c_e
+ | o 8 foo {} draft c_e
| |
- | x 6 foo {} draft c_d
+ | x 7 foo {} draft c_d
|/
o 2 foo {} draft c_c
|
@@ -284,22 +284,22 @@
$ hg stack
### target: foo (branch) (2 heads)
- s6: c_h
- s5: c_g
+ s6$ c_f (unstable)
+ s5$ c_e (unstable)
s2^ c_D (base current)
- s4$ c_f (unstable)
- s3$ c_e (unstable)
+ s4: c_h
+ s3: c_g
s2@ c_D (current)
s1: c_c
s0^ c_b (base)
$ hg phase --public b1
$ hg stack
### target: foo (branch) (2 heads)
- s5: c_h
- s4: c_g
+ s5$ c_f (unstable)
+ s4$ c_e (unstable)
s1^ c_D (base current)
- s3$ c_f (unstable)
- s2$ c_e (unstable)
+ s3: c_h
+ s2: c_g
s1@ c_D (current)
s0^ c_c (base)
@@ -310,7 +310,7 @@
changed topic on 2 changes
$ hg stack
### target: foo (branch)
- s3$ c_f (unstable)
- s2$ c_e (unstable)
+ s3: c_h
+ s2: c_g
s1@ c_D (current)
s0^ c_c (base)
--- a/tests/test-topic-change.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-topic-change.t Thu Oct 25 16:33:10 2018 +0200
@@ -181,13 +181,13 @@
Added a ()
$ hg rebase -s 11 -d 22
- rebasing 11:1315a3808ed0 "Added d" (foo)
+ rebasing 11:1315a3808ed0 "Added d"
switching to topic foo
- rebasing 16:edc4a6b9ea60 "Added e" (bar)
+ rebasing 16:edc4a6b9ea60 "Added e"
switching to topic bar
- rebasing 17:82e0b14f4d9e "Added f" (bar)
- rebasing 18:e7b418d79a05 "Added g" (bar)
- rebasing 20:c2d6b7df5dcf "Added h" (foobar)
+ rebasing 17:82e0b14f4d9e "Added f"
+ rebasing 18:e7b418d79a05 "Added g"
+ rebasing 20:c2d6b7df5dcf "Added h"
switching to topic foobar
$ hg glog
@@ -225,7 +225,7 @@
active topic 'wat' grew its first changeset
(see 'hg help topics' for more information)
$ hg glog -r .
- @ 28:61470c956807 {wat}
+ @ 29:61470c956807 {wat}
| Added h ()
|
@@ -234,7 +234,7 @@
$ hg topic --clear
$ hg ci --amend
$ hg glog -r .
- @ 29:b584fa49f42e {}
+ @ 31:b584fa49f42e {}
| Added h ()
|
@@ -246,7 +246,7 @@
active topic 'watwat' grew its first changeset
(see 'hg help topics' for more information)
$ hg glog -r .
- @ 30:a24c31c35013 {watwat}
+ @ 33:a24c31c35013 {watwat}
| Added h ()
|
@@ -272,7 +272,7 @@
$ hg bookmark book
$ hg glog
- @ 30:a24c31c35013 {watwat}
+ @ 33:a24c31c35013 {watwat}
| Added h (book)
|
o 26:7c76c271395f {bar}
@@ -304,7 +304,7 @@
changed topic on 1 changes
$ hg glog
- @ 31:c48d6d71b2d9 {}
+ @ 34:c48d6d71b2d9 {}
| Added h (book)
|
o 26:7c76c271395f {bar}
@@ -336,7 +336,7 @@
switching to topic movebook
changed topic on 1 changes
$ hg glog
- @ 32:1b83d11095b9 {movebook}
+ @ 35:1b83d11095b9 {movebook}
| Added h (book bookboo)
|
o 26:7c76c271395f {bar}
@@ -377,10 +377,10 @@
changed topic on 1 changes
$ hg glog
- @ 33:894983f69e69 {watwat}
+ @ 36:894983f69e69 {watwat}
| Added g ()
|
- | o 32:1b83d11095b9 {movebook}
+ | o 35:1b83d11095b9 {movebook}
| | Added h (book bookboo)
| |
| x 26:7c76c271395f {bar}
@@ -405,4 +405,4 @@
Added a ()
$ hg phase -r .
- 33: secret
+ 36: secret
--- a/tests/test-topic-dest.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-topic-dest.t Thu Oct 25 16:33:10 2018 +0200
@@ -111,7 +111,7 @@
switching to topic elephant
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg rebase
- rebasing 4:cb7ae72f4a80 "babar" (elephant)
+ rebasing 4:cb7ae72f4a80 "babar"
switching to topic elephant
$ hg log -G
@ 7 (elephant) babar
@@ -132,7 +132,7 @@
switching to topic monkey
1 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ hg rebase
- rebasing 5:d832ddc604ec "zephir" (monkey)
+ rebasing 5:d832ddc604ec "zephir"
switching to topic monkey
$ hg log -G
@ 8 (monkey) zephir
@@ -175,7 +175,7 @@
o 0 () c_alpha
$ hg rebase
- rebasing 9:d79a104e2902 "Huc" (tip monkey)
+ rebasing 9:d79a104e2902 "Huc" (tip)
$ hg log -G
@ 10 (monkey) Huc
|
@@ -227,7 +227,7 @@
switching to topic elephant
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere
- rebasing 7:8d0b77140b05 "babar" (elephant)
+ rebasing 7:8d0b77140b05 "babar"
switching to topic elephant
$ hg up monkey
switching to topic monkey
@@ -276,7 +276,6 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
- new changesets 13ec05df14e1:6482f08916a5
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd other
@@ -290,7 +289,6 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
- new changesets 6f5edd7450bb:c9c03b99196b
rebasing 3:dbc48dd9e743 "c_other"
$ hg log -G
@ 7 () c_other
--- a/tests/test-topic-flow-publish-flag.t Thu Oct 25 13:05:14 2018 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,429 +0,0 @@
-=====================
-Test workflow options
-=====================
-
- $ . "$TESTDIR/testlib/topic_setup.sh"
- $ . "$TESTDIR/testlib/common.sh"
-
-testing hg push --publish flag
-==============================
-
- $ hg init bare-branch-server
- $ cd bare-branch-server
- $ cat <<EOF >> .hg/hgrc
- > [phases]
- > publish = no
- > EOF
- $ mkcommit ROOT
- $ mkcommit c_dA0
- $ hg phase --public -r 'all()'
- $ cd ..
-
- $ hg clone bare-branch-server bare-client
- updating to branch default
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ cd bare-client
-
-Pushing a 1 new changeset
--------------------------
-
- $ mkcommit c_dB0
- $ hg push --publish
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
- @ 2:286d02a6e2a2 c_dB0 public default
- |
- o 1:134bc3852ad2 c_dA0 public default
- |
- o 0:ea207398892e ROOT public default
-
-
-Pushing a 2 new changeset (same branch)
----------------------------------------
-
- $ mkcommit c_dC0
- $ mkcommit c_dD0
- $ hg push --publish
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 2 changes to 2 files
- $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
- @ 4:c63e7dd93a91 c_dD0 public default
- |
- o 3:7d56a56d2547 c_dC0 public default
- |
- o 2:286d02a6e2a2 c_dB0 public default
- |
- o 1:134bc3852ad2 c_dA0 public default
- |
- o 0:ea207398892e ROOT public default
-
-
-Pushing a 2 new changeset two head
-----------------------------------
-
- $ mkcommit c_dE0
- $ hg update 'desc("c_dD0")'
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ hg branch other
- marked working directory as branch other
- (branches are permanent and global, did you want a bookmark?)
- $ mkcommit c_oF0
- $ hg push -f --publish
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 2 changes to 2 files (+1 heads)
- $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
- @ 6:45b23c834b6a c_oF0 public other
- |
- | o 5:5576ae39eaee c_dE0 public default
- |/
- o 4:c63e7dd93a91 c_dD0 public default
- |
- o 3:7d56a56d2547 c_dC0 public default
- |
- o 2:286d02a6e2a2 c_dB0 public default
- |
- o 1:134bc3852ad2 c_dA0 public default
- |
- o 0:ea207398892e ROOT public default
-
-
-Publishing 1 common changeset
------------------------------
- $ mkcommit c_oG0
- $ hg push
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
- @ 7:d293f74a1233 c_oG0 draft other
- |
- o 6:45b23c834b6a c_oF0 public other
- |
- | o 5:5576ae39eaee c_dE0 public default
- |/
- o 4:c63e7dd93a91 c_dD0 public default
- |
- o 3:7d56a56d2547 c_dC0 public default
- |
- o 2:286d02a6e2a2 c_dB0 public default
- |
- o 1:134bc3852ad2 c_dA0 public default
- |
- o 0:ea207398892e ROOT public default
-
- $ hg push --publish
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- no changes found
- [1]
- $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
- @ 7:d293f74a1233 c_oG0 public other
- |
- o 6:45b23c834b6a c_oF0 public other
- |
- | o 5:5576ae39eaee c_dE0 public default
- |/
- o 4:c63e7dd93a91 c_dD0 public default
- |
- o 3:7d56a56d2547 c_dC0 public default
- |
- o 2:286d02a6e2a2 c_dB0 public default
- |
- o 1:134bc3852ad2 c_dA0 public default
- |
- o 0:ea207398892e ROOT public default
-
-
-Selectively publishing 1 changeset
-----------------------------------
-
- $ mkcommit c_oH0
- $ hg update default
- 1 files updated, 0 files merged, 3 files removed, 0 files unresolved
- $ mkcommit c_dI0
- $ hg push -r default --publish
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
- @ 9:fbf2be276221 c_dI0 public default
- |
- o 5:5576ae39eaee c_dE0 public default
- |
- | o 8:8e85646c135f c_oH0 draft other
- | |
- | o 7:d293f74a1233 c_oG0 public other
- | |
- | o 6:45b23c834b6a c_oF0 public other
- |/
- o 4:c63e7dd93a91 c_dD0 public default
- |
- o 3:7d56a56d2547 c_dC0 public default
- |
- o 2:286d02a6e2a2 c_dB0 public default
- |
- o 1:134bc3852ad2 c_dA0 public default
- |
- o 0:ea207398892e ROOT public default
-
-
-Selectively publishing 1 common changeset
------------------------------------------
-
- $ mkcommit c_dJ0
- $ hg push
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 2 changesets with 2 changes to 2 files
- $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
- @ 10:ac4cf59f2aac c_dJ0 draft default
- |
- o 9:fbf2be276221 c_dI0 public default
- |
- o 5:5576ae39eaee c_dE0 public default
- |
- | o 8:8e85646c135f c_oH0 draft other
- | |
- | o 7:d293f74a1233 c_oG0 public other
- | |
- | o 6:45b23c834b6a c_oF0 public other
- |/
- o 4:c63e7dd93a91 c_dD0 public default
- |
- o 3:7d56a56d2547 c_dC0 public default
- |
- o 2:286d02a6e2a2 c_dB0 public default
- |
- o 1:134bc3852ad2 c_dA0 public default
- |
- o 0:ea207398892e ROOT public default
-
- $ hg push --rev default --publish
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- no changes found
- [1]
- $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
- @ 10:ac4cf59f2aac c_dJ0 public default
- |
- o 9:fbf2be276221 c_dI0 public default
- |
- o 5:5576ae39eaee c_dE0 public default
- |
- | o 8:8e85646c135f c_oH0 draft other
- | |
- | o 7:d293f74a1233 c_oG0 public other
- | |
- | o 6:45b23c834b6a c_oF0 public other
- |/
- o 4:c63e7dd93a91 c_dD0 public default
- |
- o 3:7d56a56d2547 c_dC0 public default
- |
- o 2:286d02a6e2a2 c_dB0 public default
- |
- o 1:134bc3852ad2 c_dA0 public default
- |
- o 0:ea207398892e ROOT public default
-
-
-Selectively publishing no changeset
------------------------------------
-
- $ hg push --rev default --publish
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- no changes found
- [1]
- $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
- @ 10:ac4cf59f2aac c_dJ0 public default
- |
- o 9:fbf2be276221 c_dI0 public default
- |
- o 5:5576ae39eaee c_dE0 public default
- |
- | o 8:8e85646c135f c_oH0 draft other
- | |
- | o 7:d293f74a1233 c_oG0 public other
- | |
- | o 6:45b23c834b6a c_oF0 public other
- |/
- o 4:c63e7dd93a91 c_dD0 public default
- |
- o 3:7d56a56d2547 c_dC0 public default
- |
- o 2:286d02a6e2a2 c_dB0 public default
- |
- o 1:134bc3852ad2 c_dA0 public default
- |
- o 0:ea207398892e ROOT public default
-
-
-Testing --publish interaction with multiple head detection
-============================================================
-
-pushing a topic changeset, publishing it
-----------------------------------------
-
- $ hg topic topic_A
- marked working directory as topic: topic_A
- $ mkcommit c_dK0
- active topic 'topic_A' grew its first changeset
- (see 'hg help topics' for more information)
- $ hg push -r 'desc("c_dK0")' --publish
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- active topic 'topic_A' is now empty
- $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
- @ 11:d06fc4f891e8 c_dK0 public default
- |
- o 10:ac4cf59f2aac c_dJ0 public default
- |
- o 9:fbf2be276221 c_dI0 public default
- |
- o 5:5576ae39eaee c_dE0 public default
- |
- | o 8:8e85646c135f c_oH0 draft other
- | |
- | o 7:d293f74a1233 c_oG0 public other
- | |
- | o 6:45b23c834b6a c_oF0 public other
- |/
- o 4:c63e7dd93a91 c_dD0 public default
- |
- o 3:7d56a56d2547 c_dC0 public default
- |
- o 2:286d02a6e2a2 c_dB0 public default
- |
- o 1:134bc3852ad2 c_dA0 public default
- |
- o 0:ea207398892e ROOT public default
-
-
-pushing a new branch, alongside an existing topic
--------------------------------------------------
-
- $ hg topic topic_A
- $ mkcommit c_dL0
- active topic 'topic_A' grew its first changeset
- (see 'hg help topics' for more information)
- $ hg push -r 'desc("c_dL0")'
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files
- $ hg update 'desc("c_dK")'
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ mkcommit c_dM0
- $ hg push -r 'desc("c_dM0")' --publish
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- adding changesets
- adding manifests
- adding file changes
- added 1 changesets with 1 changes to 1 files (+1 heads)
- $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
- @ 13:0d144c8b6c8f c_dM0 public default
- |
- | o 12:3c73f6cabf07 c_dL0 draft default topic_A
- |/
- o 11:d06fc4f891e8 c_dK0 public default
- |
- o 10:ac4cf59f2aac c_dJ0 public default
- |
- o 9:fbf2be276221 c_dI0 public default
- |
- o 5:5576ae39eaee c_dE0 public default
- |
- | o 8:8e85646c135f c_oH0 draft other
- | |
- | o 7:d293f74a1233 c_oG0 public other
- | |
- | o 6:45b23c834b6a c_oF0 public other
- |/
- o 4:c63e7dd93a91 c_dD0 public default
- |
- o 3:7d56a56d2547 c_dC0 public default
- |
- o 2:286d02a6e2a2 c_dB0 public default
- |
- o 1:134bc3852ad2 c_dA0 public default
- |
- o 0:ea207398892e ROOT public default
-
-
-pushing a topic (publishing) alongside and existing branch head
----------------------------------------------------------------
-
- $ hg update 'desc("c_dK")'
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- $ hg topic topic_B
- marked working directory as topic: topic_B
- $ mkcommit c_dN0
- active topic 'topic_B' grew its first changeset
- (see 'hg help topics' for more information)
- $ hg push -r 'desc("c_dN0")' --publish
- pushing to $TESTTMP/bare-branch-server
- searching for changes
- abort: push creates new remote head 4dcd0be9db96!
- (merge or see 'hg help push' for details about pushing new heads)
- [255]
- $ hg log --rev 'sort(all(), "topo")' -GT '{rev}:{node|short} {desc} {phase} {branch} {topics}'
- @ 14:4dcd0be9db96 c_dN0 draft default topic_B
- |
- | o 13:0d144c8b6c8f c_dM0 public default
- |/
- | o 12:3c73f6cabf07 c_dL0 draft default topic_A
- |/
- o 11:d06fc4f891e8 c_dK0 public default
- |
- o 10:ac4cf59f2aac c_dJ0 public default
- |
- o 9:fbf2be276221 c_dI0 public default
- |
- o 5:5576ae39eaee c_dE0 public default
- |
- | o 8:8e85646c135f c_oH0 draft other
- | |
- | o 7:d293f74a1233 c_oG0 public other
- | |
- | o 6:45b23c834b6a c_oF0 public other
- |/
- o 4:c63e7dd93a91 c_dD0 public default
- |
- o 3:7d56a56d2547 c_dC0 public default
- |
- o 2:286d02a6e2a2 c_dB0 public default
- |
- o 1:134bc3852ad2 c_dA0 public default
- |
- o 0:ea207398892e ROOT public default
-
--- a/tests/test-topic-push-concurrent-on.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-topic-push-concurrent-on.t Thu Oct 25 16:33:10 2018 +0200
@@ -94,7 +94,7 @@
$ hg outgoing -G
comparing with $TESTTMP/main (glob)
searching for changes
- @ 3 mountain draft CC
+ @ 4 mountain draft CC
$ hg push
pushing to $TESTTMP/main (glob)
@@ -109,7 +109,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 1 new obsolescence markers
+ 2 new obsolescence markers
Including on non-publishing
@@ -120,7 +120,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
- 1 new obsolescence markers
+ 2 new obsolescence markers
Testing topic behavior
======================
@@ -138,9 +138,9 @@
active topic 'babar' grew its first changeset
(see 'hg help topics' for more information)
$ hg log -G # keep track of phase because I saw some strange bug during developement
- @ 4 default babar draft CD
+ @ 5 default babar draft CD
|
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -157,9 +157,9 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
$ hg log -G
- @ 4 default babar draft CD
+ @ 5 default babar draft CD
|
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -175,9 +175,9 @@
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg log -G
- @ 4 default babar draft CD
+ @ 5 default babar draft CD
|
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -197,11 +197,11 @@
active topic 'celeste' grew its first changeset
(see 'hg help topics' for more information)
$ hg log -G # keep track of phase because I saw some strange bug during developement
- @ 5 default celeste draft CE
+ @ 6 default celeste draft CE
|
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
|/
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -221,11 +221,11 @@
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg log -G
- @ 5 default celeste draft CE
+ @ 6 default celeste draft CE
|
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
|/
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -244,11 +244,11 @@
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
$ hg log -G
- @ 5 default celeste draft CE
+ @ 6 default celeste draft CE
|
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
|/
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -264,11 +264,11 @@
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg log -G
- @ 5 default celeste draft CE
+ @ 6 default celeste draft CE
|
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
|/
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -286,13 +286,13 @@
$ hg add fff
$ hg commit -m 'CF'
$ hg log -G
- @ 6 default babar draft CF
+ @ 7 default babar draft CF
|
- | o 5 default celeste draft CE
+ | o 6 default celeste draft CE
| |
- | | o 4 default babar draft CD
+ | | o 5 default babar draft CD
| |/
- | | o 3 mountain public CC
+ | | o 4 mountain public CC
| |/
o | 1 default public CB
|/
@@ -325,17 +325,17 @@
(branch merge, don't forget to commit)
$ hg commit -m 'CM'
$ hg log -G
- @ 8 default babar draft CM
+ @ 9 default babar draft CM
|\
- | o 7 default draft CG
+ | o 8 default draft CG
| |
- o | 6 default babar draft CF
+ o | 7 default babar draft CF
| |
- | | o 5 default celeste draft CE
+ | | o 6 default celeste draft CE
| |/
- | | o 4 default babar draft CD
+ | | o 5 default babar draft CD
| |/
- | | o 3 mountain public CC
+ | | o 4 mountain public CC
| |/
o | 1 default public CB
|/
--- a/tests/test-topic-push.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-topic-push.t Thu Oct 25 16:33:10 2018 +0200
@@ -90,7 +90,7 @@
$ hg outgoing -G
comparing with $TESTTMP/main (glob)
searching for changes
- @ 3 mountain draft CC
+ @ 4 mountain draft CC
$ hg push
pushing to $TESTTMP/main (glob)
@@ -105,7 +105,7 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- 1 new obsolescence markers
+ 2 new obsolescence markers
Including on non-publishing
@@ -116,7 +116,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+1 heads)
- 1 new obsolescence markers
+ 2 new obsolescence markers
Testing topic behavior
======================
@@ -134,9 +134,9 @@
active topic 'babar' grew its first changeset
(see 'hg help topics' for more information)
$ hg log -G # keep track of phase because I saw some strange bug during developement
- @ 4 default babar draft CD
+ @ 5 default babar draft CD
|
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -153,9 +153,9 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
$ hg log -G
- @ 4 default babar draft CD
+ @ 5 default babar draft CD
|
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -180,13 +180,13 @@
$ echo bbb >> bbb
$ hg commit -m "C'B"
$ hg log -G
- @ 6 default draft C'B
+ @ 7 default draft C'B
|
- | o 5 default babar draft C'A
+ | o 6 default babar draft C'A
| |
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
| |
- | | o 3 mountain public CC
+ | | o 4 mountain public CC
| |/
o | 1 default public CB
|/
@@ -195,7 +195,7 @@
$ hg outgoing draft --topic babar
comparing with $TESTTMP/draft
searching for changes
- 5 default babar draft C'A
+ 6 default babar draft C'A
$ hg push draft --topic babar
pushing to $TESTTMP/draft
searching for changes
@@ -226,9 +226,9 @@
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg log -G
- @ 4 default babar draft CD
+ @ 5 default babar draft CD
|
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -248,11 +248,11 @@
active topic 'celeste' grew its first changeset
(see 'hg help topics' for more information)
$ hg log -G # keep track of phase because I saw some strange bug during developement
- @ 5 default celeste draft CE
+ @ 6 default celeste draft CE
|
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
|/
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -272,11 +272,11 @@
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg log -G
- @ 5 default celeste draft CE
+ @ 6 default celeste draft CE
|
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
|/
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -295,11 +295,11 @@
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
$ hg log -G
- @ 5 default celeste draft CE
+ @ 6 default celeste draft CE
|
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
|/
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -315,11 +315,11 @@
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ hg log -G
- @ 5 default celeste draft CE
+ @ 6 default celeste draft CE
|
- | o 4 default babar draft CD
+ | o 5 default babar draft CD
|/
- | o 3 mountain public CC
+ | o 4 mountain public CC
|/
| o 1 default public CB
|/
@@ -337,13 +337,13 @@
$ hg add fff
$ hg commit -m 'CF'
$ hg log -G
- @ 6 default babar draft CF
+ @ 7 default babar draft CF
|
- | o 5 default celeste draft CE
+ | o 6 default celeste draft CE
| |
- | | o 4 default babar draft CD
+ | | o 5 default babar draft CD
| |/
- | | o 3 mountain public CC
+ | | o 4 mountain public CC
| |/
o | 1 default public CB
|/
@@ -376,17 +376,17 @@
(branch merge, don't forget to commit)
$ hg commit -m 'CM'
$ hg log -G
- @ 8 default babar draft CM
+ @ 9 default babar draft CM
|\
- | o 7 default draft CG
+ | o 8 default draft CG
| |
- o | 6 default babar draft CF
+ o | 7 default babar draft CF
| |
- | | o 5 default celeste draft CE
+ | | o 6 default celeste draft CE
| |/
- | | o 4 default babar draft CD
+ | | o 5 default babar draft CD
| |/
- | | o 3 mountain public CC
+ | | o 4 mountain public CC
| |/
o | 1 default public CB
|/
--- a/tests/test-topic-rebase.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-topic-rebase.t Thu Oct 25 16:33:10 2018 +0200
@@ -72,7 +72,7 @@
switching to topic myfeature
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg rebase
- rebasing 1:39e7a938055e "add feature1" (myfeature)
+ rebasing 1:39e7a938055e "add feature1"
switching to topic myfeature
$ hg stack
### topic: myfeature
@@ -123,7 +123,7 @@
switching to topic myotherfeature
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase
- rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature)
+ rebasing 5:81f854012ec5 "myotherfeature1"
merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
switching to topic myotherfeature
@@ -137,7 +137,7 @@
(no more unresolved files)
continue: hg rebase --continue
$ hg rebase --continue
- rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature)
+ rebasing 5:81f854012ec5 "myotherfeature1"
Check the the commit has the right topic
--- a/tests/test-topic-stack-complex.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-topic-stack-complex.t Thu Oct 25 16:33:10 2018 +0200
@@ -32,10 +32,10 @@
$ echo f > f
$ hg ci -Aqm "Added e and f"
$ hg show work
- @ f1d3 (foo) Added e and f
- o 8e82 (foo) Added c and d
- o 002b (foo) Added a and b
- o f360 Added foo
+ @ f1d36 (foo) Added e and f
+ o 8e825 (foo) Added c and d
+ o 002b8 (foo) Added a and b
+ o f3603 Added foo
Testing in case of split within the topic
@@ -92,13 +92,13 @@
s0^ Added foo (base)
$ hg show work
- @ 5cce (foo) split2
- o f26c (foo) split1
- | o f1d3 (foo) Added e and f
- | x 8e82 (foo) Added c and d
+ @ 5ccee (foo) split2
+ o f26c1 (foo) split1
+ | o f1d36 (foo) Added e and f
+ | x 8e825 (foo) Added c and d
|/
- o 002b (foo) Added a and b
- o f360 Added foo
+ o 002b8 (foo) Added a and b
+ o f3603 Added foo
$ hg prev
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -113,17 +113,17 @@
+foo
$ hg amend
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg show work
- @ 7d94 (foo) split1
- | o 5cce (foo) split2
- | x f26c (foo) split1
+ @ 7d944 (foo) split1
+ | o 5ccee (foo) split2
+ | x f26c1 (foo) split1
|/
- | o f1d3 (foo) Added e and f
- | x 8e82 (foo) Added c and d
+ | o f1d36 (foo) Added e and f
+ | x 8e825 (foo) Added c and d
|/
- o 002b (foo) Added a and b
- o f360 Added foo
+ o 002b8 (foo) Added a and b
+ o f3603 Added foo
$ hg stack
### topic: foo (2 heads)
@@ -151,10 +151,10 @@
working directory parent is obsolete! (f1d3649d6a8b)
(use 'hg evolve' to update to its successor: ec94a1ed1330)
$ hg amend -d '0 1'
- 1 new orphan changesets
- 2 new content-divergent changesets
+ 1 new unstable changesets
+ 2 new divergent changesets
$ hg rebase -r . -d ec94a1ed1330~1
- rebasing 9:eb3b16fef8ea "Added e and f" (tip foo)
+ rebasing 10:eb3b16fef8ea "Added e and f" (tip)
$ hg stack
### topic: foo (2 heads)
### target: default (branch)
@@ -171,6 +171,6 @@
with: [s4] Added e and f
base: [s] Added e and f
updating to "local" side of the conflict: ec94a1ed1330
- merging "other" content-divergent changeset 'f2eff98490d2'
+ merging "other" divergent changeset 'f2eff98490d2'
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory is now at 8faad6276dc6
--- a/tests/test-topic-stack-data.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-topic-stack-data.t Thu Oct 25 16:33:10 2018 +0200
@@ -116,7 +116,7 @@
commit: (clean)
update: 2 new changesets (update)
phases: 22 draft
- orphan: 3 changesets
+ unstable: 3 changesets
topic: foo
$ hg log --graph -T '{desc} ({branch}) [{topic}]'
@ add foo_b (lake) [foo]
--- a/tests/test-topic-stack.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-topic-stack.t Thu Oct 25 16:33:10 2018 +0200
@@ -268,7 +268,7 @@
$ echo bbb > ddd
$ hg commit --amend
$ hg log -G
- @ 6 default {foo} draft c_d
+ @ 7 default {foo} draft c_d
|
| o 5 default {foo} draft c_f
| |
@@ -315,7 +315,7 @@
$ hg log -r 'stack()'
2 default {foo} draft c_c
- 6 default {foo} draft c_d
+ 7 default {foo} draft c_d
4 default {foo} draft c_e
5 default {foo} draft c_f
@@ -333,14 +333,14 @@
Make things linear again
$ hg rebase -s 'desc(c_e)' -d 'desc(c_d) - obsolete()'
- rebasing 4:0f9ac936c87d "c_e" (foo)
- rebasing 5:6559e6d93aea "c_f" (foo)
+ rebasing 4:0f9ac936c87d "c_e"
+ rebasing 5:6559e6d93aea "c_f"
$ hg log -G
- o 8 default {foo} draft c_f
+ o 9 default {foo} draft c_f
|
- o 7 default {foo} draft c_e
+ o 8 default {foo} draft c_e
|
- @ 6 default {foo} draft c_d
+ @ 7 default {foo} draft c_d
|
o 2 default {foo} draft c_c
|
@@ -361,15 +361,15 @@
$ hg add hhh
$ hg commit -m c_h
$ hg log -G
- @ 10 default {foo} draft c_h
+ @ 11 default {foo} draft c_h
|
- o 9 default {foo} draft c_g
+ o 10 default {foo} draft c_g
|
- | o 8 default {foo} draft c_f
+ | o 9 default {foo} draft c_f
| |
- | o 7 default {foo} draft c_e
+ | o 8 default {foo} draft c_e
|/
- o 6 default {foo} draft c_d
+ o 7 default {foo} draft c_d
|
o 2 default {foo} draft c_c
|
@@ -383,11 +383,11 @@
$ hg top -l
### topic: foo (2 heads)
### target: default (branch)
- s6@ c_h (current)
- s5: c_g
+ s6: c_f
+ s5: c_e
s2^ c_d (base)
- s4: c_f
- s3: c_e
+ s4@ c_h (current)
+ s3: c_g
s2: c_d
s1: c_c
s0^ c_b (base)
@@ -402,20 +402,20 @@
$ echo ccc > ddd
$ hg commit --amend -m 'c_D'
$ hg rebase -d . -s 'desc(c_g)'
- rebasing 9:81264ae8a36a "c_g" (foo)
- rebasing 10:fde5f5941642 "c_h" (foo)
+ rebasing 10:81264ae8a36a "c_g"
+ rebasing 11:fde5f5941642 "c_h"
$ hg log -G
- o 13 default {foo} draft c_h
+ o 15 default {foo} draft c_h
|
- o 12 default {foo} draft c_g
+ o 14 default {foo} draft c_g
|
- @ 11 default {foo} draft c_D
+ @ 13 default {foo} draft c_D
|
- | o 8 default {foo} draft c_f
+ | o 9 default {foo} draft c_f
| |
- | o 7 default {foo} draft c_e
+ | o 8 default {foo} draft c_e
| |
- | x 6 default {foo} draft c_d
+ | x 7 default {foo} draft c_d
|/
o 2 default {foo} draft c_c
|
@@ -427,11 +427,11 @@
$ hg topic --list
### topic: foo (2 heads)
### target: default (branch)
- s6: c_h
- s5: c_g
+ s6$ c_f (unstable)
+ s5$ c_e (unstable)
s2^ c_D (base current)
- s4$ c_f (unstable)
- s3$ c_e (unstable)
+ s4: c_h
+ s3: c_g
s2@ c_D (current)
s1: c_c
s0^ c_b (base)
@@ -448,17 +448,17 @@
==============================================================================
$ hg log --graph
- o 13 default {foo} draft c_h
+ o 15 default {foo} draft c_h
|
- o 12 default {foo} draft c_g
+ o 14 default {foo} draft c_g
|
- @ 11 default {foo} draft c_D
+ @ 13 default {foo} draft c_D
|
- | o 8 default {foo} draft c_f
+ | o 9 default {foo} draft c_f
| |
- | o 7 default {foo} draft c_e
+ | o 8 default {foo} draft c_e
| |
- | x 6 default {foo} draft c_d
+ | x 7 default {foo} draft c_d
|/
o 2 default {foo} draft c_c
|
@@ -468,19 +468,19 @@
Converting into a linear chain
$ hg rebase -s 'desc("c_e") - obsolete()' -d 'desc("c_h") - obsolete()'
- rebasing 7:215bc359096a "c_e" (foo)
- rebasing 8:ec9267b3f33f "c_f" (foo)
+ rebasing 8:215bc359096a "c_e"
+ rebasing 9:ec9267b3f33f "c_f"
$ hg log -G
- o 15 default {foo} draft c_f
+ o 17 default {foo} draft c_f
|
- o 14 default {foo} draft c_e
+ o 16 default {foo} draft c_e
|
- o 13 default {foo} draft c_h
+ o 15 default {foo} draft c_h
|
- o 12 default {foo} draft c_g
+ o 14 default {foo} draft c_g
|
- @ 11 default {foo} draft c_D
+ @ 13 default {foo} draft c_D
|
o 2 default {foo} draft c_c
|
@@ -493,19 +493,19 @@
switching to topic foobar
changed topic on 2 changes
$ hg log -G
- @ 17 default {foobar} draft c_D
+ @ 19 default {foobar} draft c_D
|
- | o 16 default {foobar} draft c_e
+ | o 18 default {foobar} draft c_e
| |
- | | o 15 default {foo} draft c_f
+ | | o 17 default {foo} draft c_f
| | |
- | | x 14 default {foo} draft c_e
+ | | x 16 default {foo} draft c_e
| |/
- | o 13 default {foo} draft c_h
+ | o 15 default {foo} draft c_h
| |
- | o 12 default {foo} draft c_g
+ | o 14 default {foo} draft c_g
| |
- | x 11 default {foo} draft c_D
+ | x 13 default {foo} draft c_D
|/
o 2 default {foo} draft c_c
|
@@ -514,30 +514,30 @@
o 0 default {} public c_a
$ hg rebase -s 'desc("c_f") - obsolete()' -d 'desc("c_e") - obsolete()'
- rebasing 15:77082e55de88 "c_f" (foo)
+ rebasing 17:77082e55de88 "c_f"
switching to topic foo
switching to topic foobar
$ hg rebase -s 'desc("c_g") - obsolete()' -d 'desc("c_D") - obsolete()'
- rebasing 12:0c3e8aed985d "c_g" (foo)
+ rebasing 14:0c3e8aed985d "c_g"
switching to topic foo
- rebasing 13:b9e4f3709bc5 "c_h" (foo)
- rebasing 16:4bc813530301 "c_e" (foobar)
+ rebasing 15:b9e4f3709bc5 "c_h"
+ rebasing 18:4bc813530301 "c_e"
switching to topic foobar
- rebasing 18:4406ea4be852 "c_f" (tip foo)
+ rebasing 20:4406ea4be852 "c_f" (tip)
switching to topic foo
switching to topic foobar
$ hg up
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log --graph
- o 22 default {foo} draft c_f
+ o 24 default {foo} draft c_f
|
- @ 21 default {foobar} draft c_e
+ @ 23 default {foobar} draft c_e
|
- o 20 default {foo} draft c_h
+ o 22 default {foo} draft c_h
|
- o 19 default {foo} draft c_g
+ o 21 default {foo} draft c_g
|
- o 17 default {foobar} draft c_D
+ o 19 default {foobar} draft c_D
|
o 2 default {foo} draft c_c
|
@@ -805,12 +805,12 @@
get things linear again
$ hg rebase -r s1 -d default
- rebasing 16:1d84ec948370 "c_D" (tip blue)
+ rebasing 16:1d84ec948370 "c_D" (tip)
switching to topic blue
$ hg rebase -r s2 -d s1
- rebasing 13:3ab2eedae500 "c_G" (blue)
+ rebasing 13:3ab2eedae500 "c_G"
$ hg rebase -r s3 -d s2
- rebasing 8:3bfe800e0486 "c_I" (blue)
+ rebasing 8:3bfe800e0486 "c_I"
$ hg stack
### topic: blue
### target: default (branch)
@@ -863,21 +863,21 @@
Done splitting? [yN] y
$ hg --config extensions.evolve= obslog --all
- o dde94df880e9 (21) c_G
+ o dde94df880e9 (22) c_G
|
- | @ e7ea874afbd5 (22) c_G
+ | @ e7ea874afbd5 (23) c_G
|/
- x b24bab30ac12 (20) c_G
- | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+ x b24bab30ac12 (21) c_G
+ | rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 907f7d3c2333 (18) c_G
- | rewritten as b24bab30ac12 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x 3ab2eedae500 (13) c_G
- | rewritten as 907f7d3c2333 using rebase by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000)
|
x c7d60a180d05 (6) c_G
- rewritten as 3ab2eedae500 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000)
$ hg export .
# HG changeset patch
--- a/tests/test-topic-tutorial.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-topic-tutorial.t Thu Oct 25 16:33:10 2018 +0200
@@ -383,7 +383,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets 6104862e8b84
(run 'hg heads' to see heads)
$ hg log -G
@@ -487,10 +486,10 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase
- rebasing 1:13900241408b "adding condiments" (food)
+ rebasing 1:13900241408b "adding condiments"
merging shopping
switching to topic food
- rebasing 2:287de11b401f "adding fruits" (food)
+ rebasing 2:287de11b401f "adding fruits"
merging shopping
$ hg log --graph
@@ -839,7 +838,6 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files (+1 heads)
- new changesets f2d6cacc6115:fbff9bc37a43
(run 'hg heads' to see heads)
There are new changes! We can simply use ``hg rebase`` to update our
@@ -1053,12 +1051,12 @@
#endif
$ hg rebase
- rebasing 6:183984ef46d1 "Adding hammer" (tools)
+ rebasing 6:183984ef46d1 "Adding hammer"
merging shopping
switching to topic tools
- rebasing 7:cffff85af537 "Adding saw" (tools)
+ rebasing 7:cffff85af537 "Adding saw"
merging shopping
- rebasing 8:34255b455dac "Adding drill" (tools)
+ rebasing 8:34255b455dac "Adding drill"
merging shopping
But what about the other topic? You can use 'hg topics --verbose' to see
@@ -1085,10 +1083,10 @@
multiple *public* heads it would create on that branch:
$ hg rebase -b drinks
- rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks)
+ rebasing 9:8dfa45bd5e0c "Adding apple juice"
merging shopping
switching to topic drinks
- rebasing 10:70dfa201ed73 "Adding orange juice" (drinks)
+ rebasing 10:70dfa201ed73 "Adding orange juice"
merging shopping
switching to topic tools
@@ -1201,7 +1199,7 @@
s0^ add a pair of shoes (base)
$ hg amend -m "Adding hammer to the shopping list"
- 2 new orphan changesets
+ 2 new unstable changesets
Understanding the current situation with hg log is not so easy, because
it shows too many things:
@@ -1230,21 +1228,21 @@
| | topic: tools
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan
+ | | trouble: unstable
| | summary: Adding drill
| |
| o changeset: 14:d4f97f32f8a1
| | topic: tools
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan
+ | | trouble: unstable
| | summary: Adding saw
| |
| x changeset: 13:a8ab3599d53d
|/ topic: tools
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 18:b7509bd417f8
+ | obsolete: reworded as b7509bd417f8
| summary: Adding hammer
|
o changeset: 12:fbff9bc37a43
@@ -1774,9 +1772,9 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase
- rebasing 19:d5c51ee5762a "Adding saw" (tools)
+ rebasing 19:d5c51ee5762a "Adding saw"
merging shopping
- rebasing 20:bae3758e46bf "Adding drill" (tools)
+ rebasing 20:bae3758e46bf "Adding drill"
merging shopping
$ hg stack
@@ -1844,7 +1842,6 @@
adding file changes
added 4 changesets with 4 changes to 1 files (+1 heads)
8 new obsolescence markers
- new changesets b7509bd417f8:2d084ac00115
(run 'hg heads' to see heads)
$ hg topics --verbose
@@ -1888,7 +1885,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 0d409663a1fd
(run 'hg update' to get a working copy)
$ hg update
--- a/tests/test-topic.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-topic.t Thu Oct 25 16:33:10 2018 +0200
@@ -597,7 +597,6 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
- new changesets 7c34953036d6:ae074045b7a7
active topic 'query' is now empty
(run 'hg update' to get a working copy)
$ hg topics
@@ -612,7 +611,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets 0469d521db49
(run 'hg heads' to see heads)
$ hg topics
fran (1 changesets)
--- a/tests/test-touch.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-touch.t Thu Oct 25 16:33:10 2018 +0200
@@ -18,7 +18,7 @@
Basic usage
$ hg log -G
- @ 0:[0-9a-f]{12} a (re)
+ @ 0:e93df3427f45 a
$ hg touch .
$ hg log -G
@@ -36,7 +36,7 @@
working directory parent is obsolete! (*) (glob)
(use 'hg evolve' to update to its successor: *) (glob)
$ hg log -G
- o 2:[0-9a-f]{12} ab (re)
+ o 3:[0-9a-f]{12} ab (re)
@ 1:[0-9a-f]{12} a (re)
@@ -44,24 +44,22 @@
[1] a
reviving this changeset will create divergence unless you make a duplicate.
(a)llow divergence or (d)uplicate the changeset? a
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg log -G
- @ 3:[0-9a-f]{12} a (re)
+ @ 4:[0-9a-f]{12} a (re)
- o 2:[0-9a-f]{12} ab (re)
+ o 3:[0-9a-f]{12} ab (re)
$ hg prune 3
- 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
- working directory now at 000000000000
1 changesets pruned
Duplicate
$ hg touch --duplicate .
$ hg log -G
- @ 4:[0-9a-f]{12} (re)
+ @ 5:[0-9a-f]{12} a (re)
- o 2:[0-9a-f]{12} ab (re)
+ o 4:[0-9a-f]{12} a (re)
Multiple touch
@@ -73,23 +71,23 @@
$ hg add d
$ hg commit -m d
$ hg log -G
- @ 6:[0-9a-f]{12} d (re)
+ @ 7:[0-9a-f]{12} d (re)
|
- o 5:[0-9a-f]{12} c (re)
+ o 6:[0-9a-f]{12} c (re)
|
- o 4:[0-9a-f]{12} (re)
+ o 5:[0-9a-f]{12} a (re)
- o 2:[0-9a-f]{12} ab (re)
+ o 4:[0-9a-f]{12} a (re)
- $ hg touch .^:.
+ $ hg touch 6:7
$ hg log -G
- @ 8:[0-9a-f]{12} d (re)
+ @ 9:[0-9a-f]{12} d (re)
|
- o 7:[0-9a-f]{12} c (re)
+ o 8:[0-9a-f]{12} c (re)
|
- o 4:[0-9a-f]{12} (re)
+ o 5:[0-9a-f]{12} a (re)
- o 2:[0-9a-f]{12} ab (re)
+ o 4:[0-9a-f]{12} a (re)
check move data kept after rebase on touch:
@@ -107,36 +105,10 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg touch
- 1 new orphan changesets
+ 1 new unstable changesets
- $ hg log -G --hidden
- @ 11:[0-9a-f]{12} gna1 (re)
- |
- . o 10:[0-9a-f]{12} move (re)
- | |
- . x 9:[0-9a-f]{12} gna1 (re)
- |/
- o 8:[0-9a-f]{12} d (re)
- |
- o 7:[0-9a-f]{12} c (re)
- |
- . x 6:[0-9a-f]{12} d (re)
- | |
- . x 5:[0-9a-f]{12} c (re)
- |/
- o 4:[0-9a-f]{12} (re)
-
- x 3:[0-9a-f]{12} a (re)
-
- o 2:[0-9a-f]{12} ab (re)
-
- x 1:[0-9a-f]{12} a (re)
-
- x 0:[0-9a-f]{12} a (re)
-
-
- $ hg rebase -s 10 -d 11
- rebasing 10:[0-9a-f]{12} "move" (re)
+ $ hg rebase -s 11 -d 12
+ rebasing 11:* "move" (glob)
$ hg st -C --change=tip
A gna2
gna1
@@ -144,18 +116,17 @@
check that the --duplicate option does not create divergence
- $ hg touch --duplicate 10 --hidden
- 1 new orphan changesets
+ $ hg touch --duplicate 11 --hidden
+ 1 new unstable changesets
check that reviving a changeset with no successor does not show the prompt
- $ hg prune 13
+ $ hg prune 14
1 changesets pruned
- $ hg touch 13 --hidden --note "testing with no successor"
- 1 new orphan changesets
- $ hg obslog -r 13 --hidden
+ $ hg touch 14 --hidden
+ 1 new unstable changesets
+ $ hg obslog -r 14 --hidden
x [0-9a-f]{12} (.*) move (re)
- pruned using prune by test (Thu Jan 01 00:00:00 1970 +0000)
- rewritten(.*) as [0-9a-f]{12} using touch by test (.*) (re)
- note: testing with no successor
+ pruned by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(.*) as [0-9a-f]{12} by test (.*) (re)
--- a/tests/test-tutorial.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-tutorial.t Thu Oct 25 16:33:10 2018 +0200
@@ -311,17 +311,15 @@
width=1];
0 -> 1 [arrowhead=none,
penwidth=2.0];
- 3 [fillcolor="#7F7FFF",
+ 4 [fillcolor="#9999FF",
fixedsize=true,
group=default,
height=1,
label=3,
pin=true,
- pos="1,3!",
+ pos="1,4!",
shape=pentagon,
style=filled,
- width=1];
- 1 -> 3 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -366,7 +364,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets 9ca060c80d74
(run 'hg heads' to see heads, 'hg merge' to merge)
I now have a new head. Note that this remote head is immutable.
@@ -412,29 +409,12 @@
width=1];
0 -> 1 [arrowhead=none,
penwidth=2.0];
- 4 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
label=4,
pin=true,
pos="1,4!",
- shape=circle,
- style=filled,
- width=1];
- 0 -> 4 [arrowhead=none,
- penwidth=2.0];
- 3 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=3,
- pin=true,
- pos="1,3!",
- shape=pentagon,
- style=filled,
- width=1];
- 1 -> 3 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -445,7 +425,7 @@
$ hg rebase --dest 9ca060c80d74 --source 4d5dc8187023
rebasing 1:4d5dc8187023 "adding condiment"
merging shopping
- rebasing 3:9d0363b81950 "adding fruit"
+ rebasing 4:9d0363b81950 "adding fruit"
merging shopping
@@ -478,30 +458,14 @@
pos="1,0!",
shape=circle,
style=filled,
- width=1];
- 4 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=4,
- pin=true,
- pos="1,4!",
- shape=circle,
- style=filled,
- width=1];
- 0 -> 4 [arrowhead=none,
- penwidth=2.0];
- 5 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
label=5,
pin=true,
pos="1,5!",
- shape=pentagon,
+ shape=circle,
style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#7F7FFF",
fixedsize=true,
@@ -515,6 +479,18 @@
width=1];
5 -> 6 [arrowhead=none,
penwidth=2.0];
+ 7 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=7,
+ pin=true,
+ pos="1,7!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 6 -> 7 [arrowhead=none,
+ penwidth=2.0];
}
#endif
@@ -580,30 +556,14 @@
pos="1,0!",
shape=circle,
style=filled,
- width=1];
- 4 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=4,
- pin=true,
- pos="1,4!",
- shape=circle,
- style=filled,
- width=1];
- 0 -> 4 [arrowhead=none,
- penwidth=2.0];
- 5 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
label=5,
pin=true,
pos="1,5!",
- shape=pentagon,
+ shape=circle,
style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#7F7FFF",
fixedsize=true,
@@ -617,6 +577,18 @@
width=1];
5 -> 6 [arrowhead=none,
penwidth=2.0];
+ 7 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=7,
+ pin=true,
+ pos="1,7!",
+ shape=pentagon,
+ style=filled,
+ width=0.5];
+ 6 -> 7 [arrowhead=none,
+ penwidth=2.0];
}
#endif
@@ -665,7 +637,7 @@
$ hg up 'p1(10b8aeaa8cc8)' # going on "bathroom stuff" parent
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg pick fac207dec9f5 # moving "SPAM SPAM" to the working directory parent
- picking 9:fac207dec9f5 "SPAM SPAM"
+ picking 10:fac207dec9f5 "SPAM SPAM"
merging shopping
$ hg log -G
@ 57e9caedbcb8 (draft): SPAM SPAM
@@ -699,30 +671,14 @@
pos="1,0!",
shape=circle,
style=filled,
- width=1];
- 4 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=4,
- pin=true,
- pos="1,4!",
- shape=circle,
- style=filled,
- width=1];
- 0 -> 4 [arrowhead=none,
- penwidth=2.0];
- 5 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
label=5,
pin=true,
pos="1,5!",
- shape=pentagon,
+ shape=circle,
style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#7F7FFF",
fixedsize=true,
@@ -736,29 +692,7 @@
width=1];
5 -> 6 [arrowhead=none,
penwidth=2.0];
- 8 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=8,
- pin=true,
- pos="1,8!",
- shape=pentagon,
- style=filled,
- width=1];
- 6 -> 8 [arrowhead=none,
- penwidth=2.0];
- 10 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=10,
- pin=true,
- pos="1,10!",
- shape=pentagon,
- style=filled,
- width=1];
- 6 -> 10 [arrowhead=none,
+ height=0.5,
penwidth=2.0];
}
#endif
@@ -802,12 +736,12 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
- 5 new obsolescence markers
+ 6 new obsolescence markers
for simplicity sake we get the bathroom change in line again
$ hg pick 10b8aeaa8cc8
- picking 8:10b8aeaa8cc8 "bathroom stuff"
+ picking 9:10b8aeaa8cc8 "bathroom stuff"
merging shopping
$ hg phase --draft .
$ hg log -G
@@ -842,54 +776,6 @@
pos="1,0!",
shape=circle,
style=filled,
- width=1];
- 4 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=4,
- pin=true,
- pos="1,4!",
- shape=circle,
- style=filled,
- width=1];
- 0 -> 4 [arrowhead=none,
- penwidth=2.0];
- 5 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=5,
- pin=true,
- pos="1,5!",
- shape=circle,
- style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
- penwidth=2.0];
- 6 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=6,
- pin=true,
- pos="1,6!",
- shape=circle,
- style=filled,
- width=1];
- 5 -> 6 [arrowhead=none,
- penwidth=2.0];
- 10 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=10,
- pin=true,
- pos="1,10!",
- shape=circle,
- style=filled,
- width=1];
- 6 -> 10 [arrowhead=none,
penwidth=2.0];
11 [fillcolor="#7F7FFF",
fixedsize=true,
@@ -898,10 +784,20 @@
label=11,
pin=true,
pos="1,11!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 7 -> 11 [arrowhead=none,
+ penwidth=2.0];
+ 12 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=12,
+ pin=true,
+ pos="1,12!",
shape=pentagon,
style=filled,
- width=1];
- 10 -> 11 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -1014,7 +910,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
- new changesets 4710c0968793
(run 'hg update' to get a working copy)
$ hg log -G
o 4710c0968793 (public): bathroom stuff
@@ -1070,7 +965,6 @@
adding file changes
added 1 changesets with 1 changes to 1 files
1 new obsolescence markers
- new changesets 4710c0968793
(run 'hg update' to get a working copy)
$ hg log -G
o 4710c0968793 (draft): bathroom stuff
@@ -1138,66 +1032,22 @@
pos="1,0!",
shape=circle,
style=filled,
- width=1];
- 4 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=4,
pin=true,
- pos="1,4!",
+ pos="1,11!",
shape=circle,
style=filled,
- width=1];
- 0 -> 4 [arrowhead=none,
+ width=0.5];
+ 7 -> 11 [arrowhead=none,
penwidth=2.0];
- 5 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=5,
- pin=true,
- pos="1,5!",
- shape=circle,
- style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
- penwidth=2.0];
- 6 [fillcolor="#7F7FFF",
+ 14 [fillcolor="#9999FF",
fixedsize=true,
group=default,
- height=1,
- label=6,
+ height=0.5,
+ label=14,
pin=true,
- pos="1,6!",
- shape=circle,
- style=filled,
- width=1];
- 5 -> 6 [arrowhead=none,
- penwidth=2.0];
- 10 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=10,
- pin=true,
- pos="1,10!",
- shape=circle,
- style=filled,
- width=1];
- 6 -> 10 [arrowhead=none,
- penwidth=2.0];
- 12 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=12,
- pin=true,
- pos="1,12!",
+ pos="1,14!",
shape=pentagon,
style=filled,
- width=1];
- 10 -> 12 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -1210,10 +1060,9 @@
adding changesets
adding manifests
adding file changes
- added 1 changesets with 1 changes to 1 files
- new changesets e4e4fa805d92
- (run 'hg update' to get a working copy)
- 1 new orphan changesets
+ added 1 changesets with 1 changes to 1 files (+1 heads)
+ (run 'hg heads' to see heads, 'hg merge' to merge)
+ 1 new unstable changesets
The new changeset "animal" is based on an old changeset of "bathroom". You can
see both version showing up in the log.
@@ -1254,95 +1103,6 @@
pos="1,0!",
shape=circle,
style=filled,
- width=1];
- 4 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=4,
- pin=true,
- pos="1,4!",
- shape=circle,
- style=filled,
- width=1];
- 0 -> 4 [arrowhead=none,
- penwidth=2.0];
- 5 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=5,
- pin=true,
- pos="1,5!",
- shape=circle,
- style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
- penwidth=2.0];
- 6 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=6,
- pin=true,
- pos="1,6!",
- shape=circle,
- style=filled,
- width=1];
- 5 -> 6 [arrowhead=none,
- penwidth=2.0];
- 10 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=10,
- pin=true,
- pos="1,10!",
- shape=circle,
- style=filled,
- width=1];
- 6 -> 10 [arrowhead=none,
- penwidth=2.0];
- 11 [fillcolor="#DFDFFF",
- fixedsize=true,
- group=default_alt,
- height=1,
- label=11,
- pin=true,
- pos="2,11!",
- shape=pentagon,
- style="dotted, filled",
- width=1];
- 10 -> 11 [arrowhead=none,
- penwidth=2.0];
- 12 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=12,
- pin=true,
- pos="1,12!",
- shape=pentagon,
- style=filled,
- width=1];
- 10 -> 12 [arrowhead=none,
- penwidth=2.0];
- 11 -> 12 [arrowtail=none,
- dir=back,
- minlen=0,
- penwidth=2.0,
- style=dashed];
- 13 [fillcolor="#FF4F4F",
- fixedsize=true,
- group=default_alt,
- height=1,
- label=13,
- pin=true,
- pos="2,13!",
- shape=pentagon,
- style=filled,
- width=1];
- 11 -> 13 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -1358,7 +1118,7 @@
$ hg push other
pushing to $TESTTMP/other (glob)
searching for changes
- abort: push includes orphan changeset: e4e4fa805d92!
+ abort: push includes unstable changeset: e4e4fa805d92!
(use 'hg evolve' to get a stable history or --force to ignore warnings)
[255]
@@ -1369,15 +1129,15 @@
It has a --dry-run option to only suggest the next move.
$ hg evolve --dry-run
- move:[13] animals
- atop:[12] bathroom stuff
+ move:[15] animals
+ atop:[14] bathroom stuff
hg rebase -r e4e4fa805d92 -d 682004e81e71
Let's do it
$ hg evolve
- move:[13] animals
- atop:[12] bathroom stuff
+ move:[15] animals
+ atop:[14] bathroom stuff
merging shopping
working directory is now at 2a2b36e14660
@@ -1417,30 +1177,6 @@
pos="1,0!",
shape=circle,
style=filled,
- width=1];
- 4 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=4,
- pin=true,
- pos="1,4!",
- shape=circle,
- style=filled,
- width=1];
- 0 -> 4 [arrowhead=none,
- penwidth=2.0];
- 5 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=5,
- pin=true,
- pos="1,5!",
- shape=circle,
- style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#7F7FFF",
fixedsize=true,
@@ -1454,41 +1190,6 @@
width=1];
5 -> 6 [arrowhead=none,
penwidth=2.0];
- 10 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=10,
- pin=true,
- pos="1,10!",
- shape=circle,
- style=filled,
- width=1];
- 6 -> 10 [arrowhead=none,
- penwidth=2.0];
- 12 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=12,
- pin=true,
- pos="1,12!",
- shape=pentagon,
- style=filled,
- width=1];
- 10 -> 12 [arrowhead=none,
- penwidth=2.0];
- 14 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=14,
- pin=true,
- pos="1,14!",
- shape=pentagon,
- style=filled,
- width=1];
- 12 -> 14 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -1502,7 +1203,7 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files (+1 heads)
- 2 new obsolescence markers
+ 3 new obsolescence markers
obsoleted 2 changesets
Remote get a warning that current working directory is based on an obsolete
@@ -1543,7 +1244,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets fc41faf45288
(run 'hg update' to get a working copy)
$ hg log -G
o fc41faf45288 (draft): SPAM SPAM SPAM
@@ -1581,20 +1281,6 @@
pos="1,0!",
shape=circle,
style=filled,
- width=1];
- 4 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=4,
- pin=true,
- pos="1,4!",
- shape=circle,
- style=filled,
- width=1];
- 0 -> 4 [arrowhead=none,
- penwidth=2.0];
- 5 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -1603,8 +1289,6 @@
pos="1,5!",
shape=circle,
style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#7F7FFF",
fixedsize=true,
@@ -1618,29 +1302,19 @@
width=1];
5 -> 6 [arrowhead=none,
penwidth=2.0];
- 10 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
- height=1,
- label=10,
pin=true,
- pos="1,10!",
+ pos="1,7!",
shape=circle,
style=filled,
- width=1];
- 6 -> 10 [arrowhead=none,
penwidth=2.0];
- 12 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
- height=1,
- label=12,
pin=true,
- pos="1,12!",
- shape=pentagon,
+ pos="1,11!",
+ shape=circle,
style=filled,
- width=1];
- 10 -> 12 [arrowhead=none,
penwidth=2.0];
14 [fillcolor="#7F7FFF",
fixedsize=true,
@@ -1651,20 +1325,13 @@
pos="1,14!",
shape=pentagon,
style=filled,
- width=1];
- 12 -> 14 [arrowhead=none,
penwidth=2.0];
- 15 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
- height=1,
- label=15,
pin=true,
- pos="1,15!",
+ pos="1,16!",
shape=pentagon,
style=filled,
- width=1];
- 14 -> 15 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -1675,7 +1342,7 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
working directory now at 682004e81e71
1 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
The animals changeset is still displayed because the "SPAM SPAM SPAM" changeset
@@ -1717,20 +1384,6 @@
pos="1,0!",
shape=circle,
style=filled,
- width=1];
- 4 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=4,
- pin=true,
- pos="1,4!",
- shape=circle,
- style=filled,
- width=1];
- 0 -> 4 [arrowhead=none,
- penwidth=2.0];
- 5 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -1739,8 +1392,6 @@
pos="1,5!",
shape=circle,
style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#7F7FFF",
fixedsize=true,
@@ -1754,53 +1405,47 @@
width=1];
5 -> 6 [arrowhead=none,
penwidth=2.0];
- 10 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
- height=1,
- label=10,
pin=true,
- pos="1,10!",
+ pos="1,7!",
shape=circle,
style=filled,
- width=1];
- 6 -> 10 [arrowhead=none,
penwidth=2.0];
- 12 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
- height=1,
- label=12,
pin=true,
- pos="1,12!",
+ pos="1,11!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 7 -> 11 [arrowhead=none,
+ penwidth=2.0];
+ 14 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=14,
+ pin=true,
+ pos="1,14!",
shape=pentagon,
style=filled,
- width=1];
- 10 -> 12 [arrowhead=none,
penwidth=2.0];
- 14 [fillcolor="#DFDFFF",
+ 16 [fillcolor="#DFDFFF",
fixedsize=true,
group=default_alt,
- height=1,
- label=14,
pin=true,
- pos="2,14!",
+ pos="2,16!",
shape=pentagon,
style="dotted, filled",
- width=1];
- 12 -> 14 [arrowhead=none,
penwidth=2.0];
- 15 [fillcolor="#FF4F4F",
+ 17 [fillcolor="#FF4F4F",
fixedsize=true,
group=default_alt,
- height=1,
- label=15,
pin=true,
- pos="2,15!",
+ pos="2,17!",
shape=pentagon,
style=filled,
- width=1];
- 14 -> 15 [arrowhead=none,
penwidth=2.0];
}
#endif
@@ -1817,13 +1462,11 @@
splines=polyline
];
node [label="\N"];
- 15 [fillcolor="#FF4F4F",
+ 17 [fillcolor="#FF4F4F",
fixedsize=true,
group=default_alt,
- height=1,
- label=15,
pin=true,
- pos="1,15!",
+ pos="1,17!",
shape=pentagon,
style=filled,
width=1];
@@ -1831,8 +1474,8 @@
#endif
$ hg evolve
- move:[15] SPAM SPAM SPAM
- atop:[12] bathroom stuff
+ move:[17] SPAM SPAM SPAM
+ atop:[14] bathroom stuff
merging shopping
working directory is now at e6cfcb672150
@@ -1870,20 +1513,6 @@
pos="1,0!",
shape=circle,
style=filled,
- width=1];
- 4 [fillcolor="#7F7FFF",
- fixedsize=true,
- group=default,
- height=1,
- label=4,
- pin=true,
- pos="1,4!",
- shape=circle,
- style=filled,
- width=1];
- 0 -> 4 [arrowhead=none,
- penwidth=2.0];
- 5 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
height=1,
@@ -1892,8 +1521,6 @@
pos="1,5!",
shape=circle,
style=filled,
- width=1];
- 4 -> 5 [arrowhead=none,
penwidth=2.0];
6 [fillcolor="#7F7FFF",
fixedsize=true,
@@ -1907,41 +1534,38 @@
width=1];
5 -> 6 [arrowhead=none,
penwidth=2.0];
- 10 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
- height=1,
- label=10,
pin=true,
- pos="1,10!",
+ pos="1,7!",
shape=circle,
style=filled,
- width=1];
- 6 -> 10 [arrowhead=none,
penwidth=2.0];
- 12 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
- height=1,
- label=12,
pin=true,
- pos="1,12!",
+ pos="1,11!",
+ shape=circle,
+ style=filled,
+ width=0.5];
+ 7 -> 11 [arrowhead=none,
+ penwidth=2.0];
+ 14 [fillcolor="#9999FF",
+ fixedsize=true,
+ group=default,
+ height=0.5,
+ label=14,
+ pin=true,
+ pos="1,14!",
shape=pentagon,
style=filled,
- width=1];
- 10 -> 12 [arrowhead=none,
penwidth=2.0];
- 16 [fillcolor="#7F7FFF",
fixedsize=true,
group=default,
- height=1,
- label=16,
pin=true,
- pos="1,16!",
+ pos="1,18!",
shape=pentagon,
style=filled,
- width=1];
- 12 -> 16 [arrowhead=none,
penwidth=2.0];
}
#endif
--- a/tests/test-uncommit-interactive.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-uncommit-interactive.t Thu Oct 25 16:33:10 2018 +0200
@@ -134,6 +134,8 @@
> n
> n
> EOF
+ current hg version does not support storing note in obsmarker
+ current hg version does not support storing note in obsmarker
diff --git a/a b/a
3 hunks, 6 lines changed
examine changes to 'a'? [Ynesfdaq?] y
@@ -168,7 +170,7 @@
@ 678a59e5ff90 (3) another one
|
x f70fb463d5bf (1) another one
- rewritten(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
note: note on amend --extract
The unselected part should be in the diff
@@ -233,6 +235,7 @@
> n
> y
> EOF
+ current hg version does not support storing note in obsmarker
diff --git a/a b/a
2 hunks, 3 lines changed
examine changes to 'a'? [Ynesfdaq?] y
@@ -300,11 +303,11 @@
@ 46e35360be47 (5) another one
|
x 678a59e5ff90 (3) another one
- | rewritten(content) as 46e35360be47 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
+ | rewritten(content) as 46e35360be47 by test (Thu Jan 01 00:00:00 1970 +0000)
| note: testing uncommit on dirty wdir
|
x f70fb463d5bf (1) another one
- rewritten(content) as 678a59e5ff90 using uncommit by test (Thu Jan 01 00:00:00 1970 +0000)
+ rewritten(content) as 678a59e5ff90 by test (Thu Jan 01 00:00:00 1970 +0000)
note: note on amend --extract
@@ -312,7 +315,7 @@
$ hg amend
$ glog
- @ 6:905eb2a23ea2@default(draft) another one
+ @ 7:905eb2a23ea2@default(draft) another one
|
o 0:7733902a8d94@default(draft) The base commit
@@ -455,9 +458,9 @@
undeleting a
$ glog
- @ 10:42cc15efbec2@default(draft) Added foo
+ @ 12:42cc15efbec2@default(draft) Added foo
|
- o 6:905eb2a23ea2@default(draft) another one
+ o 7:905eb2a23ea2@default(draft) another one
|
o 0:7733902a8d94@default(draft) The base commit
@@ -527,11 +530,11 @@
=====================================================
$ glog
- @ 16:25a080d13cb2@default(draft) Added x
+ @ 18:25a080d13cb2@default(draft) Added x
|
- o 10:42cc15efbec2@default(draft) Added foo
+ o 12:42cc15efbec2@default(draft) Added foo
|
- o 6:905eb2a23ea2@default(draft) another one
+ o 7:905eb2a23ea2@default(draft) another one
|
o 0:7733902a8d94@default(draft) The base commit
@@ -607,7 +610,7 @@
patching file a
Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg diff
diff -r 676366511f95 a
--- a/tests/test-uncommit.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-uncommit.t Thu Oct 25 16:33:10 2018 +0200
@@ -233,7 +233,7 @@
touncommit-bm-inactive 4:e8db4aa611f6
unrelated 2:f63b90038565
$ hg debugobsolete
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
Test phase is preserved, no local changes
@@ -244,7 +244,7 @@
(use 'hg evolve' to update to its successor: e8db4aa611f6)
$ hg --config extensions.purge= purge
$ hg uncommit -I 'set:added() and e'
- 2 new content-divergent changesets
+ 2 new divergent changesets
$ hg st --copies
A e
$ hg st --copies --change .
@@ -279,8 +279,8 @@
o 0:07f494440405@default(draft) adda
$ hg debugobsolete
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
Test --all
@@ -290,7 +290,7 @@
(5eb72dbe0cb4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
$ hg --config extensions.purge= purge
$ hg uncommit --all -X e
- 1 new content-divergent changesets
+ 1 new divergent changesets
$ hg st --copies
M b
M d
@@ -313,9 +313,9 @@
A e
$ hg debugobsolete
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
Display a warning if nothing left
@@ -323,10 +323,10 @@
new changeset is empty
(use 'hg prune .' to remove it)
$ hg debugobsolete
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
- 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
- c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'uncommit', 'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 e8db4aa611f6d5706374288e6898e498f5c44098 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 a1d4c1ad76cc7eb5e8a36ef52396da334b6d59c5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
+ 5eb72dbe0cb409d094e3b4ae8eaa30071c1b8730 c4cbebac3751269bdf12d1466deabcc78521d272 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
+ c4cbebac3751269bdf12d1466deabcc78521d272 4f1c269eab68720f54e88ce3c1dc02b2858b6b89 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'user': 'test'}
Test instability warning
@@ -337,7 +337,7 @@
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
[8] touncommit
$ hg uncommit aa
- 1 new orphan changesets
+ 1 new unstable changesets
Test uncommiting agains a different base
--- a/tests/test-unstable.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-unstable.t Thu Oct 25 16:33:10 2018 +0200
@@ -42,7 +42,7 @@
$ hg up "desc(_b)"
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg amend -m "bprime"
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg log -G
@ 3:36050226a9b9@default(draft) bprime
|
@@ -82,14 +82,14 @@
created new head
$ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
1 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg up "desc(_a)"
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommits bsecondsplit1 bsecondsplit2
created new head
$ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)"
1 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)"
1 changesets pruned
$ hg log -G
--- a/tests/test-userguide.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-userguide.t Thu Oct 25 16:33:10 2018 +0200
@@ -42,8 +42,10 @@
(use --hidden to access hidden revisions; successor: 934359450037)
[255]
$ hg --hidden shortlog -G
- @ 2:934359450037 draft implement feature Y
+ @ 3:934359450037 draft implement feature Y
|
+ | x 2:6c5f78d5d467 draft temporary amend commit for fe0ecd3bd2a4
+ | |
| x 1:fe0ecd3bd2a4 draft implement feature Y
|/
o 0:08c4b6f4efc8 draft init
@@ -52,8 +54,10 @@
$ hg rollback -q
$ hg amend -u alice -d '2 0' -m 'implement feature Y'
$ hg --hidden shortlog -G
- @ 2:934359450037 draft implement feature Y
+ @ 3:934359450037 draft implement feature Y
|
+ | x 2:6c5f78d5d467 draft temporary amend commit for fe0ecd3bd2a4
+ | |
| x 1:fe0ecd3bd2a4 draft implement feature Y
|/
o 0:08c4b6f4efc8 draft init
@@ -66,11 +70,11 @@
working directory now at 934359450037
1 changesets pruned
$ hg parents --template '{rev}:{node|short} {desc|firstline}\n'
- 2:934359450037 implement feature Y
+ 3:934359450037 implement feature Y
$ hg --hidden shortlog -G -r 934359450037:
- x 3:a3e0ef24aaf0 draft debug hack
+ x 4:a3e0ef24aaf0 draft debug hack
|
- @ 2:934359450037 draft implement feature Y
+ @ 3:934359450037 draft implement feature Y
|
~
@@ -82,15 +86,15 @@
$ hg status
M file2.c
$ hg --hidden shortlog -G -r 'descendants(934359450037) - a3e0ef24aaf0'
- @ 5:c8defeecf7a4 draft fix bug 234
+ @ 6:c8defeecf7a4 draft fix bug 234
|
- | x 4:da4331967f5f draft fix bug 234
+ | x 5:da4331967f5f draft fix bug 234
|/
- o 2:934359450037 draft implement feature Y
+ o 3:934359450037 draft implement feature Y
|
~
$ hg parents --template '{rev}:{node|short} {desc|firstline}\n{files}\n'
- 5:c8defeecf7a4 fix bug 234
+ 6:c8defeecf7a4 fix bug 234
file1.c
$ hg revert --no-backup file2.c
@@ -102,30 +106,30 @@
$ echo step3 >> file2.c
$ hg commit -m 'step 3'
$ hg log --template '{rev}:{node|short} {desc|firstline}\n' -r 05e61aab8294::
- 6:05e61aab8294 step 1
- 7:be6d5bc8e4cc step 2
- 8:35f432d9f7c1 step 3
+ 7:05e61aab8294 step 1
+ 8:be6d5bc8e4cc step 2
+ 9:35f432d9f7c1 step 3
$ hg fold -d '0 0' -m 'fix bug 64' --from -r 05e61aab8294::
3 changesets folded
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --hidden shortlog -G -r c8defeecf7a4::
- @ 9:171c6a79a27b draft fix bug 64
+ @ 10:171c6a79a27b draft fix bug 64
|
- | x 8:35f432d9f7c1 draft step 3
+ | x 9:35f432d9f7c1 draft step 3
| |
- | x 7:be6d5bc8e4cc draft step 2
+ | x 8:be6d5bc8e4cc draft step 2
| |
- | x 6:05e61aab8294 draft step 1
+ | x 7:05e61aab8294 draft step 1
|/
- o 5:c8defeecf7a4 draft fix bug 234
+ o 6:c8defeecf7a4 draft fix bug 234
|
~
$ hg --hidden log -q -r 'successors(05e61aab8294) | successors(be6d5bc8e4cc) | successors(35f432d9f7c1)'
- 9:171c6a79a27b
+ 10:171c6a79a27b
$ hg --hidden log -q -r 'precursors(171c6a79a27b)'
- 6:05e61aab8294
- 7:be6d5bc8e4cc
- 8:35f432d9f7c1
+ 7:05e61aab8294
+ 8:be6d5bc8e4cc
+ 9:35f432d9f7c1
$ hg diff -c 171c6a79a27b -U 0
diff -r c8defeecf7a4 -r 171c6a79a27b file1.c
--- a/file1.c Thu Jan 01 00:00:10 1970 +0000
@@ -147,13 +151,13 @@
$ echo 'new feature' >> file1.c
$ hg commit -u bob -d '5 0' -m 'feature 23'
$ hg --hidden shortlog -G -r 171c6a79a27b::
- @ 12:dadcbba2d606 draft feature 23
+ @ 13:dadcbba2d606 draft feature 23
|
- o 11:debd46bb29dc draft cleanup
+ o 12:debd46bb29dc draft cleanup
|
- o 10:3e1cb8f70c02 draft fix bug 17
+ o 11:3e1cb8f70c02 draft fix bug 17
|
- o 9:171c6a79a27b draft fix bug 64
+ o 10:171c6a79a27b draft fix bug 64
|
~
@@ -161,33 +165,35 @@
$ hg update -q -r 3e1cb8f70c02
$ echo 'fix fix fix fix' > file2.c
$ hg amend -u bob -d '6 0'
- 2 new orphan changesets
+ 2 new unstable changesets
$ hg shortlog -r 'obsolete()'
- 10:3e1cb8f70c02 draft fix bug 17
+ 11:3e1cb8f70c02 draft fix bug 17
$ hg shortlog -r "orphan()"
- 11:debd46bb29dc draft cleanup
- 12:dadcbba2d606 draft feature 23
+ 12:debd46bb29dc draft cleanup
+ 13:dadcbba2d606 draft feature 23
$ hg --hidden shortlog -G -r 171c6a79a27b::
- @ 13:395cbeda3a06 draft fix bug 17
+ @ 15:395cbeda3a06 draft fix bug 17
|
- | o 12:dadcbba2d606 draft feature 23
+ | x 14:f7fab707e247 draft temporary amend commit for 3e1cb8f70c02
| |
- | o 11:debd46bb29dc draft cleanup
- | |
- | x 10:3e1cb8f70c02 draft fix bug 17
+ | | o 13:dadcbba2d606 draft feature 23
+ | | |
+ | | o 12:debd46bb29dc draft cleanup
+ | |/
+ | x 11:3e1cb8f70c02 draft fix bug 17
|/
- o 9:171c6a79a27b draft fix bug 64
+ o 10:171c6a79a27b draft fix bug 64
|
~
$ hg evolve -q --all
$ hg shortlog -G -r 171c6a79a27b::
- @ 15:91b4b0f8b5c5 draft feature 23
+ @ 17:91b4b0f8b5c5 draft feature 23
|
- o 14:fe8858bd9bc2 draft cleanup
+ o 16:fe8858bd9bc2 draft cleanup
|
- o 13:395cbeda3a06 draft fix bug 17
+ o 15:395cbeda3a06 draft fix bug 17
|
- o 9:171c6a79a27b draft fix bug 64
+ o 10:171c6a79a27b draft fix bug 64
|
~
@@ -199,35 +205,35 @@
$ echo 'more useful' >> file1.c
$ hg commit -u carl -d '9 0' -m 'more work'
$ hg shortlog -G -r 91b4b0f8b5c5::
- @ 18:ea8fafca914b draft more work
+ @ 20:ea8fafca914b draft more work
|
- o 17:b23d06b457a8 draft debug hack
+ o 19:b23d06b457a8 draft debug hack
|
- o 16:1f33e68b18b9 draft useful work
+ o 18:1f33e68b18b9 draft useful work
|
- o 15:91b4b0f8b5c5 draft feature 23
+ o 17:91b4b0f8b5c5 draft feature 23
|
~
example 8: prune an older changeset (figures 8, 9)
$ hg prune b23d06b457a8
1 changesets pruned
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg --hidden shortlog -G -r b23d06b457a8::
- @ 18:ea8fafca914b draft more work
+ @ 20:ea8fafca914b draft more work
|
- x 17:b23d06b457a8 draft debug hack
+ x 19:b23d06b457a8 draft debug hack
|
~
$ hg evolve -q --all --any
$ hg --hidden shortlog -G -r 1f33e68b18b9::
- @ 19:4393e5877437 draft more work
+ @ 21:4393e5877437 draft more work
|
- | x 18:ea8fafca914b draft more work
+ | x 20:ea8fafca914b draft more work
| |
- | x 17:b23d06b457a8 draft debug hack
+ | x 19:b23d06b457a8 draft debug hack
|/
- o 16:1f33e68b18b9 draft useful work
+ o 18:1f33e68b18b9 draft useful work
|
~
@@ -241,32 +247,32 @@
$ hg update -r f84357446753
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg shortlog -G -r 4393e5877437::
- o 21:4db2428c8ae3 draft fix bug 67
+ o 23:4db2428c8ae3 draft fix bug 67
|
- @ 20:f84357446753 draft fix bug 53
+ @ 22:f84357446753 draft fix bug 53
|
- o 19:4393e5877437 draft more work
+ o 21:4393e5877437 draft more work
|
~
$ hg uncommit file2.c
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg status
M file2.c
$ hg revert file2.c
$ hg evolve --all --any
- move:[21] fix bug 67
- atop:[22] fix bug 53
+ move:[23] fix bug 67
+ atop:[24] fix bug 53
working directory is now at 0d972d6888e6
$ hg --hidden shortlog -G -r 4393e5877437::
- @ 23:0d972d6888e6 draft fix bug 67
+ @ 25:0d972d6888e6 draft fix bug 67
|
- o 22:71bb83d674c5 draft fix bug 53
+ o 24:71bb83d674c5 draft fix bug 53
|
- | x 21:4db2428c8ae3 draft fix bug 67
+ | x 23:4db2428c8ae3 draft fix bug 67
| |
- | x 20:f84357446753 draft fix bug 53
+ | x 22:f84357446753 draft fix bug 53
|/
- o 19:4393e5877437 draft more work
+ o 21:4393e5877437 draft more work
|
~
$ rm file2.c.orig
@@ -281,45 +287,45 @@
$ hg update 5b31a1239ab9
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg --hidden shortlog -G -r 0d972d6888e6::
- o 25:fbb3c6d50427 draft new feature
+ o 27:fbb3c6d50427 draft new feature
|
- @ 24:5b31a1239ab9 draft fix a bug
+ @ 26:5b31a1239ab9 draft fix a bug
|
- o 23:0d972d6888e6 draft fix bug 67
+ o 25:0d972d6888e6 draft fix bug 67
|
~
$ hg uncommit file2.c
- 1 new orphan changesets
+ 1 new unstable changesets
$ hg status
M file2.c
$ hg commit -m 'useful tweak'
$ hg --hidden shortlog -G -r 0d972d6888e6::
- @ 27:51e0d8c0a922 draft useful tweak
+ @ 29:51e0d8c0a922 draft useful tweak
|
- o 26:2594e98553a9 draft fix a bug
+ o 28:2594e98553a9 draft fix a bug
|
- | o 25:fbb3c6d50427 draft new feature
+ | o 27:fbb3c6d50427 draft new feature
| |
- | x 24:5b31a1239ab9 draft fix a bug
+ | x 26:5b31a1239ab9 draft fix a bug
|/
- o 23:0d972d6888e6 draft fix bug 67
+ o 25:0d972d6888e6 draft fix bug 67
|
~
$ hg evolve --all --any
- move:[25] new feature
- atop:[26] fix a bug
+ move:[27] new feature
+ atop:[28] fix a bug
working directory is now at 166c1c368ab6
$ hg --hidden shortlog -G -r 0d972d6888e6::
- @ 28:166c1c368ab6 draft new feature
+ @ 30:166c1c368ab6 draft new feature
|
- | o 27:51e0d8c0a922 draft useful tweak
+ | o 29:51e0d8c0a922 draft useful tweak
|/
- o 26:2594e98553a9 draft fix a bug
+ o 28:2594e98553a9 draft fix a bug
|
- | x 25:fbb3c6d50427 draft new feature
+ | x 27:fbb3c6d50427 draft new feature
| |
- | x 24:5b31a1239ab9 draft fix a bug
+ | x 26:5b31a1239ab9 draft fix a bug
|/
- o 23:0d972d6888e6 draft fix bug 67
+ o 25:0d972d6888e6 draft fix bug 67
|
~
--- a/tests/test-wireproto-bundle1.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-wireproto-bundle1.t Thu Oct 25 16:33:10 2018 +0200
@@ -50,7 +50,6 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets 8685c6d34325:4957bfdac07e
(run 'hg update' to get a working copy)
$ hg push -R ../other
pushing to ssh://user@dummy/server
@@ -70,7 +69,7 @@
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
- remote: 1 new obsolescence markers
+ remote: 2 new obsolescence markers
remote: obsoleted 1 changesets
$ hg push
pushing to ssh://user@dummy/server
@@ -88,9 +87,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
- 1 new obsolescence markers
+ 2 new obsolescence markers
obsoleted 1 changesets
- new changesets 9d1c114e7797
(run 'hg heads' to see heads)
$ hg -R ../other pull
pulling from ssh://user@dummy/server
--- a/tests/test-wireproto.t Thu Oct 25 13:05:14 2018 +0200
+++ b/tests/test-wireproto.t Thu Oct 25 16:33:10 2018 +0200
@@ -53,7 +53,6 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
- new changesets 8685c6d34325:4957bfdac07e
(run 'hg update' to get a working copy)
$ hg push -R ../other
pushing to ssh://user@dummy/server
@@ -73,8 +72,8 @@
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files (+1 heads)
- remote: obsmarker-exchange: 92 bytes received
- remote: 1 new obsolescence markers
+ remote: obsmarker-exchange: 151 bytes received
+ remote: 2 new obsolescence markers
remote: obsoleted 1 changesets
$ hg push
pushing to ssh://user@dummy/server
@@ -92,10 +91,9 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
- obsmarker-exchange: 92 bytes received
- 1 new obsolescence markers
+ obsmarker-exchange: 151 bytes received
+ 2 new obsolescence markers
obsoleted 1 changesets
- new changesets 9d1c114e7797
(run 'hg heads' to see heads)
$ hg -R ../other pull
pulling from ssh://user@dummy/server
@@ -117,8 +115,8 @@
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 1 files
- remote: obsmarker-exchange: 92 bytes received
- remote: 1 new obsolescence markers
+ remote: obsmarker-exchange: 151 bytes received
+ remote: 2 new obsolescence markers
$ hg -R ../other pull
pulling from ssh://user@dummy/server
searching for changes
@@ -126,9 +124,8 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- obsmarker-exchange: 92 bytes received
- 1 new obsolescence markers
- new changesets a5687ec59dd4
+ obsmarker-exchange: 151 bytes received
+ 2 new obsolescence markers
(run 'hg update' to get a working copy)
some common hidden
@@ -141,7 +138,7 @@
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 0 changes to 1 files (+1 heads)
- remote: obsmarker-exchange: 183 bytes received
+ remote: obsmarker-exchange: 226 bytes received
remote: 1 new obsolescence markers
remote: obsoleted 1 changesets
$ hg -R ../other pull
@@ -151,10 +148,9 @@
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
- obsmarker-exchange: 183 bytes received
+ obsmarker-exchange: 226 bytes received
1 new obsolescence markers
obsoleted 1 changesets
- new changesets * (glob)
(run 'hg heads' to see heads)
test discovery avoid exchanging known markers
@@ -177,7 +173,7 @@
(skipping discovery of obsolescence markers, will exchange everything)
(controled by 'experimental.evolution.obsdiscovery' configuration)
no changes found
- remote: obsmarker-exchange: 274 bytes received
+ remote: obsmarker-exchange: 376 bytes received
[1]
$ hg -R ../other pull --config experimental.evolution.obsdiscovery=no
pulling from ssh://user@dummy/server
@@ -185,7 +181,7 @@
no changes found
(skipping discovery of obsolescence markers, will exchange everything)
(controled by 'experimental.evolution.obsdiscovery' configuration)
- obsmarker-exchange: 274 bytes received
+ obsmarker-exchange: 376 bytes received
$ cd ..
@@ -195,7 +191,7 @@
$ cat hg.pid >> $DAEMON_PIDS
$ curl -s http://localhost:$HGPORT/?cmd=capabilities
- _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
+ _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
Check we cannot use pushkey for marker exchange anymore