--- a/tests/test-up-local-change.t Thu Sep 02 22:17:22 2010 +0200
+++ b/tests/test-up-local-change.t Thu Sep 02 23:22:51 2010 +0200
@@ -6,7 +6,7 @@
$ echo a > a
$ hg addremove
adding a
- $ hg commit -m "1" -d "1000000 0"
+ $ hg commit -m "1"
$ hg clone . ../r2
updating to branch default
@@ -16,7 +16,7 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo abc > a
$ hg diff --nodates
- diff -r 33aaa84a386b a
+ diff -r c19d34741b0a a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
@@ -28,16 +28,16 @@
$ echo a2 > a
$ hg addremove
adding b
- $ hg commit -m "2" -d "1000000 0"
+ $ hg commit -m "2"
$ cd ../r2
$ hg -q pull ../r1
$ hg status
M a
$ hg parents
- changeset: 0:33aaa84a386b
+ changeset: 0:c19d34741b0a
user: test
- date: Mon Jan 12 13:46:40 1970 +0000
+ date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
$ hg --debug up
@@ -46,28 +46,28 @@
b
resolving manifests
overwrite False partial False
- ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
+ ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb
a: versions differ -> m
b: remote created -> g
preserving a for resolve of a
updating: a 1/2 files (50.00%)
picked tool 'true' for a (binary False symlink False)
merging a
- my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
+ my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
updating: b 2/2 files (100.00%)
getting b
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg parents
- changeset: 1:802f095af299
+ changeset: 1:1e71731e6fbb
tag: tip
user: test
- date: Mon Jan 12 13:46:40 1970 +0000
+ date: Thu Jan 01 00:00:00 1970 +0000
summary: 2
$ hg --debug up 0
resolving manifests
overwrite False partial False
- ancestor 802f095af299 local 802f095af299+ remote 33aaa84a386b
+ ancestor 1e71731e6fbb local 1e71731e6fbb+ remote c19d34741b0a
a: versions differ -> m
b: other deleted -> r
preserving a for resolve of a
@@ -76,21 +76,21 @@
updating: a 2/2 files (100.00%)
picked tool 'true' for a (binary False symlink False)
merging a
- my a@802f095af299+ other a@33aaa84a386b ancestor a@802f095af299
+ my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
0 files updated, 1 files merged, 1 files removed, 0 files unresolved
$ hg parents
- changeset: 0:33aaa84a386b
+ changeset: 0:c19d34741b0a
user: test
- date: Mon Jan 12 13:46:40 1970 +0000
+ date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
$ hg --debug merge || echo failed
abort: there is nothing to merge - use "hg update" instead
failed
$ hg parents
- changeset: 0:33aaa84a386b
+ changeset: 0:c19d34741b0a
user: test
- date: Mon Jan 12 13:46:40 1970 +0000
+ date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
$ hg --debug up
@@ -99,44 +99,44 @@
b
resolving manifests
overwrite False partial False
- ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
+ ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb
a: versions differ -> m
b: remote created -> g
preserving a for resolve of a
updating: a 1/2 files (50.00%)
picked tool 'true' for a (binary False symlink False)
merging a
- my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
+ my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
updating: b 2/2 files (100.00%)
getting b
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
$ hg parents
- changeset: 1:802f095af299
+ changeset: 1:1e71731e6fbb
tag: tip
user: test
- date: Mon Jan 12 13:46:40 1970 +0000
+ date: Thu Jan 01 00:00:00 1970 +0000
summary: 2
$ hg -v history
- changeset: 1:802f095af299
+ changeset: 1:1e71731e6fbb
tag: tip
user: test
- date: Mon Jan 12 13:46:40 1970 +0000
+ date: Thu Jan 01 00:00:00 1970 +0000
files: a b
description:
2
- changeset: 0:33aaa84a386b
+ changeset: 0:c19d34741b0a
user: test
- date: Mon Jan 12 13:46:40 1970 +0000
+ date: Thu Jan 01 00:00:00 1970 +0000
files: a
description:
1
$ hg diff --nodates
- diff -r 802f095af299 a
+ diff -r 1e71731e6fbb a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
@@ -153,7 +153,7 @@
$ echo a3 > a
$ hg addremove
adding b
- $ hg commit -m "3" -d "1000000 0"
+ $ hg commit -m "3"
created new head
$ cd ../r2
@@ -161,9 +161,9 @@
$ hg status
M a
$ hg parents
- changeset: 1:802f095af299
+ changeset: 1:1e71731e6fbb
user: test
- date: Mon Jan 12 13:46:40 1970 +0000
+ date: Thu Jan 01 00:00:00 1970 +0000
summary: 2
$ hg --debug up || echo failed
@@ -176,7 +176,7 @@
searching for copies back to rev 1
resolving manifests
overwrite False partial False
- ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d
+ ancestor c19d34741b0a local 1e71731e6fbb+ remote 83c51d0caff4
a: versions differ -> m
b: versions differ -> m
preserving a for resolve of a
@@ -184,28 +184,28 @@
updating: a 1/2 files (50.00%)
picked tool 'true' for a (binary False symlink False)
merging a
- my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b
+ my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a
updating: b 2/2 files (100.00%)
picked tool 'true' for b (binary False symlink False)
merging b
- my b@802f095af299+ other b@030602aee63d ancestor b@000000000000
+ my b@1e71731e6fbb+ other b@83c51d0caff4 ancestor b@000000000000
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg parents
- changeset: 1:802f095af299
+ changeset: 1:1e71731e6fbb
user: test
- date: Mon Jan 12 13:46:40 1970 +0000
+ date: Thu Jan 01 00:00:00 1970 +0000
summary: 2
- changeset: 2:030602aee63d
+ changeset: 2:83c51d0caff4
tag: tip
- parent: 0:33aaa84a386b
+ parent: 0:c19d34741b0a
user: test
- date: Mon Jan 12 13:46:40 1970 +0000
+ date: Thu Jan 01 00:00:00 1970 +0000
summary: 3
$ hg diff --nodates
- diff -r 802f095af299 a
+ diff -r 1e71731e6fbb a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@