--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -1,5 +1,5 @@
adding a
-diff -r c19d34741b0a a
+diff -r 33aaa84a386b a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@ a
@@ -7,9 +7,9 @@ diff -r c19d34741b0a a
+abc
adding b
M a
-changeset: 0:c19d34741b0a
+changeset: 0:33aaa84a386b
user: test
-date: Thu Jan 1 00:00:00 1970 +0000
+date: Mon Jan 12 13:46:40 1970 +0000
summary: 1
resolving manifests
@@ -22,10 +22,10 @@ merging a
resolving a
file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
-changeset: 1:1e71731e6fbb
+changeset: 1:802f095af299
tag: tip
user: test
-date: Thu Jan 1 00:00:00 1970 +0000
+date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
resolving manifests
@@ -34,16 +34,16 @@ resolving manifests
remote deleted b
removing b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-changeset: 0:c19d34741b0a
+changeset: 0:33aaa84a386b
user: test
-date: Thu Jan 1 00:00:00 1970 +0000
+date: Mon Jan 12 13:46:40 1970 +0000
summary: 1
abort: there is nothing to merge, just use 'hg update'
failed
-changeset: 0:c19d34741b0a
+changeset: 0:33aaa84a386b
user: test
-date: Thu Jan 1 00:00:00 1970 +0000
+date: Mon Jan 12 13:46:40 1970 +0000
summary: 1
resolving manifests
@@ -56,30 +56,30 @@ merging a
resolving a
file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
-changeset: 1:1e71731e6fbb
+changeset: 1:802f095af299
tag: tip
user: test
-date: Thu Jan 1 00:00:00 1970 +0000
+date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
-changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
+changeset: 1:802f095af299cde27a85b2f056aef3829870956c
tag: tip
user: test
-date: Thu Jan 1 00:00:00 1970 +0000
+date: Mon Jan 12 13:46:40 1970 +0000
files: a b
description:
2
-changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
+changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1
user: test
-date: Thu Jan 1 00:00:00 1970 +0000
+date: Mon Jan 12 13:46:40 1970 +0000
files: a
description:
1
-diff -r 1e71731e6fbb a
+diff -r 802f095af299 a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@ a2
@@ -87,9 +87,9 @@ diff -r 1e71731e6fbb a
+abc
adding b
M a
-changeset: 1:1e71731e6fbb
+changeset: 1:802f095af299
user: test
-date: Thu Jan 1 00:00:00 1970 +0000
+date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
resolving manifests
@@ -118,19 +118,19 @@ resolving b
file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-changeset: 1:1e71731e6fbb
+changeset: 1:802f095af299
user: test
-date: Thu Jan 1 00:00:00 1970 +0000
+date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
-changeset: 2:83c51d0caff4
+changeset: 2:030602aee63d
tag: tip
-parent: 0:c19d34741b0a
+parent: 0:33aaa84a386b
user: test
-date: Thu Jan 1 00:00:00 1970 +0000
+date: Mon Jan 12 13:46:40 1970 +0000
summary: 3
-diff -r 1e71731e6fbb a
+diff -r 802f095af299 a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@ a2