2005-07-23 07:46:02 +04:00
|
|
|
adding a
|
2008-03-21 16:52:24 +03:00
|
|
|
updating working directory
|
2006-05-02 20:44:02 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
2006-03-13 15:05:41 +03:00
|
|
|
diff -r 33aaa84a386b a
|
2005-06-15 01:28:42 +04:00
|
|
|
--- a/a
|
|
|
|
+++ b/a
|
2008-01-16 20:14:24 +03:00
|
|
|
@@ -1,1 +1,1 @@
|
2005-06-15 01:28:42 +04:00
|
|
|
-a
|
|
|
|
+abc
|
2005-07-23 07:46:02 +04:00
|
|
|
adding b
|
2005-07-21 21:40:28 +04:00
|
|
|
M a
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 0:33aaa84a386b
|
2006-02-01 10:46:24 +03:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2006-02-01 10:46:24 +03:00
|
|
|
summary: 1
|
|
|
|
|
2005-06-15 01:28:42 +04:00
|
|
|
resolving manifests
|
2006-10-10 11:15:20 +04:00
|
|
|
overwrite False partial False
|
|
|
|
ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
|
2008-03-16 04:03:18 +03:00
|
|
|
searching for copies back to rev 1
|
2007-10-05 04:44:37 +04:00
|
|
|
unmatched files in other:
|
|
|
|
b
|
2006-09-18 06:27:30 +04:00
|
|
|
a: versions differ -> m
|
|
|
|
b: remote created -> g
|
2008-04-11 00:02:24 +04:00
|
|
|
preserving a for resolve of a
|
2008-02-04 04:29:05 +03:00
|
|
|
picked tool 'true' for a (binary False symlink False)
|
2005-06-15 01:28:42 +04:00
|
|
|
merging a
|
2006-10-10 11:15:20 +04:00
|
|
|
my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
|
2006-08-23 03:06:17 +04:00
|
|
|
getting b
|
2006-03-13 10:56:59 +03:00
|
|
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 1:802f095af299
|
2006-02-01 10:46:24 +03:00
|
|
|
tag: tip
|
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2006-02-01 10:46:24 +03:00
|
|
|
summary: 2
|
|
|
|
|
|
|
|
resolving manifests
|
2006-10-10 11:15:20 +04:00
|
|
|
overwrite False partial False
|
|
|
|
ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b
|
2006-09-18 06:27:30 +04:00
|
|
|
b: remote deleted -> r
|
2006-02-01 10:46:24 +03:00
|
|
|
removing b
|
2006-03-13 10:56:59 +03:00
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 0:33aaa84a386b
|
2006-02-01 10:46:24 +03:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2006-02-01 10:46:24 +03:00
|
|
|
summary: 1
|
|
|
|
|
2006-08-15 22:38:07 +04:00
|
|
|
abort: there is nothing to merge - use "hg update" instead
|
2005-12-15 07:19:03 +03:00
|
|
|
failed
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 0:33aaa84a386b
|
2006-02-01 10:46:24 +03:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2006-02-01 10:46:24 +03:00
|
|
|
summary: 1
|
|
|
|
|
2005-06-15 01:28:42 +04:00
|
|
|
resolving manifests
|
2006-10-10 11:15:20 +04:00
|
|
|
overwrite False partial False
|
|
|
|
ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
|
2008-03-16 04:03:18 +03:00
|
|
|
searching for copies back to rev 1
|
2007-10-05 04:44:37 +04:00
|
|
|
unmatched files in other:
|
|
|
|
b
|
2006-09-18 06:27:30 +04:00
|
|
|
a: versions differ -> m
|
|
|
|
b: remote created -> g
|
2008-04-11 00:02:24 +04:00
|
|
|
preserving a for resolve of a
|
2008-02-04 04:29:05 +03:00
|
|
|
picked tool 'true' for a (binary False symlink False)
|
2006-02-01 10:46:24 +03:00
|
|
|
merging a
|
2006-10-10 11:15:20 +04:00
|
|
|
my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
|
2006-08-23 03:06:17 +04:00
|
|
|
getting b
|
2006-03-13 10:56:59 +03:00
|
|
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 1:802f095af299
|
2005-06-17 14:03:03 +04:00
|
|
|
tag: tip
|
2005-06-15 01:28:42 +04:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-06-15 01:28:42 +04:00
|
|
|
summary: 2
|
|
|
|
|
2006-08-21 07:51:56 +04:00
|
|
|
changeset: 1:802f095af299
|
2005-06-17 14:03:03 +04:00
|
|
|
tag: tip
|
2005-06-15 01:28:42 +04:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-06-15 01:28:42 +04:00
|
|
|
files: a b
|
|
|
|
description:
|
|
|
|
2
|
|
|
|
|
2005-07-01 10:40:32 +04:00
|
|
|
|
2006-08-21 07:51:56 +04:00
|
|
|
changeset: 0:33aaa84a386b
|
2005-06-15 01:28:42 +04:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2005-06-15 01:28:42 +04:00
|
|
|
files: a
|
|
|
|
description:
|
|
|
|
1
|
|
|
|
|
2005-07-01 10:40:32 +04:00
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
diff -r 802f095af299 a
|
2006-02-01 10:46:24 +03:00
|
|
|
--- a/a
|
|
|
|
+++ b/a
|
2008-01-16 20:14:24 +03:00
|
|
|
@@ -1,1 +1,1 @@
|
2006-02-01 10:46:24 +03:00
|
|
|
-a2
|
|
|
|
+abc
|
2006-05-02 20:44:02 +04:00
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
2006-02-01 10:46:24 +03:00
|
|
|
adding b
|
2008-03-21 13:06:02 +03:00
|
|
|
created new head
|
2006-02-01 10:46:24 +03:00
|
|
|
M a
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 1:802f095af299
|
2006-02-01 10:46:24 +03:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2006-02-01 10:46:24 +03:00
|
|
|
summary: 2
|
|
|
|
|
2008-03-24 18:01:05 +03:00
|
|
|
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
|
2006-02-01 10:46:24 +03:00
|
|
|
failed
|
2006-03-24 16:53:23 +03:00
|
|
|
abort: outstanding uncommitted changes
|
2006-02-01 10:46:24 +03:00
|
|
|
failed
|
|
|
|
resolving manifests
|
2006-10-10 11:15:20 +04:00
|
|
|
overwrite False partial False
|
|
|
|
ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d
|
2007-10-05 04:44:37 +04:00
|
|
|
searching for copies back to rev 1
|
2006-09-18 06:27:30 +04:00
|
|
|
a: versions differ -> m
|
|
|
|
b: versions differ -> m
|
2008-04-11 00:02:24 +04:00
|
|
|
preserving a for resolve of a
|
|
|
|
preserving b for resolve of b
|
2008-02-04 04:29:05 +03:00
|
|
|
picked tool 'true' for a (binary False symlink False)
|
2006-02-01 10:46:24 +03:00
|
|
|
merging a
|
2006-10-10 11:15:20 +04:00
|
|
|
my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b
|
2008-02-04 04:29:05 +03:00
|
|
|
picked tool 'true' for b (binary False symlink False)
|
2006-02-01 10:46:24 +03:00
|
|
|
merging b
|
2006-10-10 11:15:20 +04:00
|
|
|
my b@802f095af299+ other b@030602aee63d ancestor b@000000000000
|
2006-03-13 10:56:59 +03:00
|
|
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 1:802f095af299
|
2006-02-01 10:46:24 +03:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2006-02-01 10:46:24 +03:00
|
|
|
summary: 2
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
changeset: 2:030602aee63d
|
2006-02-01 10:46:24 +03:00
|
|
|
tag: tip
|
2006-03-13 15:05:41 +03:00
|
|
|
parent: 0:33aaa84a386b
|
2006-02-01 10:46:24 +03:00
|
|
|
user: test
|
2006-03-13 15:05:41 +03:00
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
2006-02-01 10:46:24 +03:00
|
|
|
summary: 3
|
|
|
|
|
2006-03-13 15:05:41 +03:00
|
|
|
diff -r 802f095af299 a
|
2005-07-23 19:00:56 +04:00
|
|
|
--- a/a
|
|
|
|
+++ b/a
|
2008-01-16 20:14:24 +03:00
|
|
|
@@ -1,1 +1,1 @@
|
2005-07-23 19:00:56 +04:00
|
|
|
-a2
|
|
|
|
+abc
|
2006-04-14 02:41:50 +04:00
|
|
|
adding a
|
|
|
|
pulling from ../a
|
|
|
|
requesting all changes
|
|
|
|
adding changesets
|
|
|
|
adding manifests
|
|
|
|
adding file changes
|
|
|
|
added 1 changesets with 1 changes to 1 files
|
2006-10-16 01:18:09 +04:00
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|