2005-07-23 07:46:02 +04:00
|
|
|
adding a
|
2005-06-17 23:37:23 +04:00
|
|
|
diff -r c19d34741b0a a
|
2005-06-15 01:28:42 +04:00
|
|
|
--- a/a
|
|
|
|
+++ b/a
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-a
|
|
|
|
+abc
|
2005-07-23 07:46:02 +04:00
|
|
|
adding b
|
2005-07-21 21:40:28 +04:00
|
|
|
M a
|
2005-06-15 01:28:42 +04:00
|
|
|
resolving manifests
|
2005-07-11 04:19:36 +04:00
|
|
|
force None allow None moddirstate True linear True
|
2005-06-16 09:12:28 +04:00
|
|
|
ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
|
2005-06-15 01:28:42 +04:00
|
|
|
a versions differ, resolve
|
|
|
|
remote created b
|
|
|
|
getting b
|
|
|
|
merging a
|
|
|
|
resolving a
|
2005-06-16 09:12:28 +04:00
|
|
|
file a: other d730145abbf9 ancestor b789fdd96dc2
|
2005-06-15 01:28:42 +04:00
|
|
|
resolving manifests
|
2005-07-11 04:19:36 +04:00
|
|
|
force None allow 1 moddirstate True linear True
|
2005-06-16 09:12:28 +04:00
|
|
|
ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
|
2005-07-27 22:21:19 +04:00
|
|
|
changeset: 1:1e71731e6fbb
|
2005-06-17 14:03:03 +04:00
|
|
|
tag: tip
|
2005-06-15 01:28:42 +04:00
|
|
|
user: test
|
2005-08-20 11:23:42 +04:00
|
|
|
date: Thu Jan 1 00:00:00 1970 +0000
|
2005-06-15 01:28:42 +04:00
|
|
|
summary: 2
|
|
|
|
|
|
|
|
changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
|
2005-06-17 14:03:03 +04:00
|
|
|
tag: tip
|
2005-06-15 01:28:42 +04:00
|
|
|
user: test
|
2005-08-20 11:23:42 +04:00
|
|
|
date: Thu Jan 1 00:00:00 1970 +0000
|
2005-06-15 01:28:42 +04:00
|
|
|
files: a b
|
|
|
|
description:
|
|
|
|
2
|
|
|
|
|
2005-07-01 10:40:32 +04:00
|
|
|
|
2005-06-15 01:28:42 +04:00
|
|
|
changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
|
|
|
|
user: test
|
2005-08-20 11:23:42 +04:00
|
|
|
date: Thu Jan 1 00:00:00 1970 +0000
|
2005-06-15 01:28:42 +04:00
|
|
|
files: a
|
|
|
|
description:
|
|
|
|
1
|
|
|
|
|
2005-07-01 10:40:32 +04:00
|
|
|
|
2005-07-23 19:00:56 +04:00
|
|
|
diff -r 1e71731e6fbb a
|
|
|
|
--- a/a
|
|
|
|
+++ b/a
|
|
|
|
@@ -1,1 +1,1 @@
|
|
|
|
-a2
|
|
|
|
+abc
|