|
|
adding a
|
|
|
updating working directory
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
diff -r 33aaa84a386b a
|
|
|
--- a/a
|
|
|
+++ b/a
|
|
|
@@ -1,1 +1,1 @@
|
|
|
-a
|
|
|
+abc
|
|
|
adding b
|
|
|
M a
|
|
|
changeset: 0:33aaa84a386b
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: 1
|
|
|
|
|
|
resolving manifests
|
|
|
overwrite False partial False
|
|
|
ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
|
|
|
searching for copies back to rev 1
|
|
|
unmatched files in other:
|
|
|
b
|
|
|
a: versions differ -> m
|
|
|
b: remote created -> g
|
|
|
preserving a for resolve of a
|
|
|
picked tool 'true' for a (binary False symlink False)
|
|
|
merging a
|
|
|
my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
|
|
|
getting b
|
|
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
changeset: 1:802f095af299
|
|
|
tag: tip
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: 2
|
|
|
|
|
|
resolving manifests
|
|
|
overwrite False partial False
|
|
|
ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b
|
|
|
a: versions differ -> m
|
|
|
b: other deleted -> r
|
|
|
preserving a for resolve of a
|
|
|
removing b
|
|
|
picked tool 'true' for a (binary False symlink False)
|
|
|
merging a
|
|
|
my a@802f095af299+ other a@33aaa84a386b ancestor a@33aaa84a386b
|
|
|
premerge successful
|
|
|
0 files updated, 1 files merged, 1 files removed, 0 files unresolved
|
|
|
changeset: 0:33aaa84a386b
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: 1
|
|
|
|
|
|
abort: there is nothing to merge - use "hg update" instead
|
|
|
failed
|
|
|
changeset: 0:33aaa84a386b
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: 1
|
|
|
|
|
|
resolving manifests
|
|
|
overwrite False partial False
|
|
|
ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
|
|
|
searching for copies back to rev 1
|
|
|
unmatched files in other:
|
|
|
b
|
|
|
a: versions differ -> m
|
|
|
b: remote created -> g
|
|
|
preserving a for resolve of a
|
|
|
picked tool 'true' for a (binary False symlink False)
|
|
|
merging a
|
|
|
my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
|
|
|
getting b
|
|
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
changeset: 1:802f095af299
|
|
|
tag: tip
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: 2
|
|
|
|
|
|
changeset: 1:802f095af299
|
|
|
tag: tip
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
files: a b
|
|
|
description:
|
|
|
2
|
|
|
|
|
|
|
|
|
changeset: 0:33aaa84a386b
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
files: a
|
|
|
description:
|
|
|
1
|
|
|
|
|
|
|
|
|
diff -r 802f095af299 a
|
|
|
--- a/a
|
|
|
+++ b/a
|
|
|
@@ -1,1 +1,1 @@
|
|
|
-a2
|
|
|
+abc
|
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
adding b
|
|
|
created new head
|
|
|
M a
|
|
|
changeset: 1:802f095af299
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: 2
|
|
|
|
|
|
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
|
|
|
failed
|
|
|
abort: outstanding uncommitted changes (use 'hg status' to list changes)
|
|
|
failed
|
|
|
resolving manifests
|
|
|
overwrite False partial False
|
|
|
ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d
|
|
|
searching for copies back to rev 1
|
|
|
a: versions differ -> m
|
|
|
b: versions differ -> m
|
|
|
preserving a for resolve of a
|
|
|
preserving b for resolve of b
|
|
|
picked tool 'true' for a (binary False symlink False)
|
|
|
merging a
|
|
|
my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b
|
|
|
picked tool 'true' for b (binary False symlink False)
|
|
|
merging b
|
|
|
my b@802f095af299+ other b@030602aee63d ancestor b@000000000000
|
|
|
0 files updated, 2 files merged, 0 files removed, 0 files unresolved
|
|
|
(branch merge, don't forget to commit)
|
|
|
changeset: 1:802f095af299
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: 2
|
|
|
|
|
|
changeset: 2:030602aee63d
|
|
|
tag: tip
|
|
|
parent: 0:33aaa84a386b
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: 3
|
|
|
|
|
|
diff -r 802f095af299 a
|
|
|
--- a/a
|
|
|
+++ b/a
|
|
|
@@ -1,1 +1,1 @@
|
|
|
-a2
|
|
|
+abc
|
|
|
adding a
|
|
|
pulling from ../a
|
|
|
requesting all changes
|
|
|
adding changesets
|
|
|
adding manifests
|
|
|
adding file changes
|
|
|
added 1 changesets with 1 changes to 1 files
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
