test: highlight data handling when solving divergence
The current handling of date is lacking, we add test to highlight this.
--- a/tests/test-evolve-issue5958.t Sat Dec 07 03:27:50 2019 +0530
+++ b/tests/test-evolve-issue5958.t Tue Dec 10 19:13:06 2019 +0100
@@ -79,6 +79,15 @@
rewritten(date) as 0065551bd38f using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
rewritten(date) as c17bf400a278 using metaedit by test (Thu Jan 01 00:00:00 1970 +0000)
+ $ hg evolve --list --rev .
+ 08bc7ba82799: add foo.txt
+ content-divergent: c17bf400a278 (draft) (precursor cc71ffbc7c00)
+
+ $ hg log --hidden -r cc71ffbc7c00 -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
+ 1 cc71ffbc7c00 1970-01-01 00:00 +0000: date-changed using metaedit as 4:c17bf400a278; date-changed using metaedit as 2:0065551bd38f
+ $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
+ 4 c17bf400a278 1969-12-31 23:59 -0000:
+ 6 08bc7ba82799 1969-12-31 23:59 -0000:
$ hg evolve --content-divergent
merge:[6] add foo.txt
with: [4] add foo.txt
@@ -86,3 +95,7 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 new orphan changesets
working directory is now at 2372e6d39855
+ $ hg log -r 'desc("add foo.txt")' -T '{rev} {node|short} {date|isodate}: {join(obsfate, "; ")}\n'
+ 4 c17bf400a278 1969-12-31 23:59 -0000: rewritten using evolve as 7:2372e6d39855
+ 7 2372e6d39855 1970-01-01 00:00 +0000:
+ 7 bb2424887202 1969-12-31 23:59 +0000: (false !)