77 | |
77 | |
78 x cc71ffbc7c00 (1) add foo.txt |
78 x cc71ffbc7c00 (1) add foo.txt |
79 rewritten(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
79 rewritten(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
80 rewritten(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
80 rewritten(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000) |
81 |
81 |
|
82 $ hg evolve --list --rev . |
|
83 08bc7ba82799: add foo.txt |
|
84 content-divergent: c17bf400a278 (draft) (precursor cc71ffbc7c00) |
|
85 |
|
86 $ hg log --hidden -r cc71ffbc7c00 -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
87 1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f |
|
88 $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
89 4 c17bf400a278 1969-12-31 23:59 -0000: |
|
90 6 08bc7ba82799 1969-12-31 23:59 -0000: |
82 $ hg evolve --content-divergent |
91 $ hg evolve --content-divergent |
83 merge:[6] add foo.txt |
92 merge:[6] add foo.txt |
84 with: [4] add foo.txt |
93 with: [4] add foo.txt |
85 base: [1] add foo.txt |
94 base: [1] add foo.txt |
86 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
95 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
87 1 new orphan changesets |
96 1 new orphan changesets |
88 working directory is now at 2372e6d39855 |
97 working directory is now at 2372e6d39855 |
|
98 $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n' |
|
99 4 c17bf400a278 1969-12-31 23:59 -0000: rewritten using evolve as 7:2372e6d39855 |
|
100 7 2372e6d39855 1970-01-01 00:00 +0000: |
|
101 7 bb2424887202 1969-12-31 23:59 +0000: (false !) |