59 o changeset: 0:a24ed8ad918c |
59 o changeset: 0:a24ed8ad918c |
60 user: test |
60 user: test |
61 date: Thu Jan 01 00:00:00 1970 +0000 |
61 date: Thu Jan 01 00:00:00 1970 +0000 |
62 summary: add r0 |
62 summary: add r0 |
63 |
63 |
|
64 $ hg debugobsolete |
|
65 cc71ffbc7c002d7b45fb694f9c060bf2e6920672 0065551bd38fe59ea4a069a4db378550c60122d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'metaedit', 'user': 'test'} |
|
66 0065551bd38fe59ea4a069a4db378550c60122d3 a25dd7af6cf6731ff93708abb2b1b889eae848a0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
67 cc71ffbc7c002d7b45fb694f9c060bf2e6920672 c17bf400a2782394b1ca5fbbe59e30494f16dfdc 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '32', 'operation': 'metaedit', 'user': 'test'} |
|
68 a25dd7af6cf6731ff93708abb2b1b889eae848a0 1d1fc409af989f5c0843507e202d69a1ad16c5ef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
69 1d1fc409af989f5c0843507e202d69a1ad16c5ef 08bc7ba82799f1e419190b0dac1b0e1c4b1355f9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'rebase', 'user': 'test'} |
64 $ hg obslog -a -r . |
70 $ hg obslog -a -r . |
65 @ 08bc7ba82799 (6) add foo.txt |
71 @ 08bc7ba82799 (6) add foo.txt |
|
72 | rewritten(parent, content) from 1d1fc409af98 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
66 | |
73 | |
67 | * c17bf400a278 (4) add foo.txt |
74 | * c17bf400a278 (4) add foo.txt |
|
75 | | date-changed(date) from cc71ffbc7c00 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
68 | | |
76 | | |
69 x | 1d1fc409af98 (5) add foo.txt |
77 x | 1d1fc409af98 (5) add foo.txt |
70 | | rewritten(parent, content) as 08bc7ba82799 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
78 | | amended(content) from a25dd7af6cf6 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
71 | | |
79 | | |
72 x | a25dd7af6cf6 (3) add foo.txt |
80 x | a25dd7af6cf6 (3) add foo.txt |
73 | | amended(content) as 1d1fc409af98 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
81 | | amended(content) from 0065551bd38f using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
74 | | |
82 | | |
75 x | 0065551bd38f (2) add foo.txt |
83 x | 0065551bd38f (2) add foo.txt |
76 |/ amended(content) as a25dd7af6cf6 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
84 |/ date-changed(date) from cc71ffbc7c00 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
77 | |
85 | |
78 x cc71ffbc7c00 (1) add foo.txt |
86 x cc71ffbc7c00 (1) add foo.txt |
79 date-changed(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
|
80 date-changed(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
|
81 |
87 |
82 $ hg evolve --content-divergent |
88 $ hg evolve --content-divergent |
83 merge:[6] add foo.txt |
89 merge:[6] add foo.txt |
84 with: [4] add foo.txt |
90 with: [4] add foo.txt |
85 base: [1] add foo.txt |
91 base: [1] add foo.txt |
86 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
92 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
87 1 new orphan changesets |
93 1 new orphan changesets |
88 working directory is now at 459c64f7eaad |
94 working directory is now at 5899f25049de |