--- a/tests/test-rewind.t Fri Aug 03 00:19:47 2018 +0200
+++ b/tests/test-rewind.t Fri Aug 03 00:22:50 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