##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Update on pull -u when heads were closed (fixes issue666)....
Update on pull -u when heads were closed (fixes issue666). Patch written by Benoit Boissinot. This should probably be improved in the future to handle long-living branches, as joining two "other" heads will switch to that new head. But this is not a new problem, as adding to the "other" head would have switched to that new head, too.
Matt Mackall - - Load All Authors

File last commit:

r3618:3109f012 default
r5080:73fdc8bd default
Show More
test-merge1.out
55 lines | 1.5 KiB | text/plain | TextLexer
/ tests / test-merge1.out
History | Annotation | Raw |Copy content |Copy permalink
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
%% 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
%% merge should fail
abort: untracked local file 'b' differs from remote version
%% 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
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 b1
+This is file b22
M b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
%% 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 b1
+This is file b33
M b