|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
created new head
|
|
|
%% no merges expected
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
(branch merge, don't forget to commit)
|
|
|
diff -r d9e5953b9dec b
|
|
|
--- /dev/null
|
|
|
+++ b/b
|
|
|
@@ -0,0 +1,1 @@
|
|
|
+This is file b1
|
|
|
M b
|
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
|
created new head
|
|
|
%% merge should fail
|
|
|
abort: untracked file in working directory differs from file in requested revision: 'b'
|
|
|
%% merge of b expected
|
|
|
merging for b
|
|
|
merging b
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
(branch merge, don't forget to commit)
|
|
|
diff -r d9e5953b9dec b
|
|
|
--- /dev/null
|
|
|
+++ b/b
|
|
|
@@ -0,0 +1,1 @@
|
|
|
+This is file b2
|
|
|
M b
|
|
|
%%
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
created new head
|
|
|
Contents of b should be "this is file b1"
|
|
|
This is file b1
|
|
|
%% merge fails
|
|
|
abort: outstanding uncommitted changes
|
|
|
%% merge expected!
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
(branch merge, don't forget to commit)
|
|
|
diff -r c1dd73cbf59f b
|
|
|
--- a/b
|
|
|
+++ b/b
|
|
|
@@ -1,1 +1,1 @@
|
|
|
-This is file b1
|
|
|
+This is file b22
|
|
|
M b
|
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
created new head
|
|
|
%% merge of b should fail
|
|
|
abort: outstanding uncommitted changes
|
|
|
%% merge of b expected
|
|
|
merging for b
|
|
|
merging b
|
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
(branch merge, don't forget to commit)
|
|
|
diff -r c1dd73cbf59f b
|
|
|
--- a/b
|
|
|
+++ b/b
|
|
|
@@ -1,1 +1,1 @@
|
|
|
-This is file b1
|
|
|
+This is file b33
|
|
|
M b
|
|
|
|
