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

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

CVS import: Support new-style .cvspass-file format....
CVS import: Support new-style .cvspass-file format. Based on an email from Ralf.Leibold at nuance dot com
Matt Mackall - - Load All Authors

File last commit:

r3618:3109f012 default
r5082:dc2e512c default
Show More
test-merge1.out
55 lines | 1.5 KiB | text/plain | TextLexer
/ tests / test-merge1.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
mpm@selenic.com
Fix bug with co -C across branches, update tests
 r1236 %% no merges expected
Matt Mackall
merge: if filemerge skips merge, report as updated
 r3400 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 (branch merge, don't forget to commit)
Benoit Boissinot
fix traceback of extdiff after a merge...
 r3330 diff -r d9e5953b9dec b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+This is file b1
M b
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Benoit Boissinot
abort when merging two heads and repository has local changes
 r1581 %% merge should fail
Matt Mackall
Clarify untracked file merge message
 r3618 abort: untracked local file 'b' differs from remote version
mpm@selenic.com
Fix bug with co -C across branches, update tests
 r1236 %% merge of b expected
mpm@selenic.com
[PATCH] Merging identical changes from another branch...
 r407 merging for b
merging b
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Benoit Boissinot
fix traceback of extdiff after a merge...
 r3330 diff -r d9e5953b9dec b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+This is file b2
M b
mpm@selenic.com
Fix bug with co -C across branches, update tests
 r1236 %%
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
mpm@selenic.com
Fix bug with co -C across branches, update tests
 r1236 Contents of b should be "this is file b1"
mpm@selenic.com
Fix up test-merge1...
 r430 This is file b1
Benoit Boissinot
abort when merging two heads and repository has local changes
 r1581 %% merge fails
mcmillen@cs.cmu.edu
Spelling fix: "commited" -> "committed"
 r1995 abort: outstanding uncommitted changes
mpm@selenic.com
Fix bug with co -C across branches, update tests
 r1236 %% merge expected!
Matt Mackall
merge: if filemerge skips merge, report as updated
 r3400 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 (branch merge, don't forget to commit)
Benoit Boissinot
fix traceback of extdiff after a merge...
 r3330 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
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Benoit Boissinot
abort when merging two heads and repository has local changes
 r1581 %% merge of b should fail
mcmillen@cs.cmu.edu
Spelling fix: "commited" -> "committed"
 r1995 abort: outstanding uncommitted changes
mpm@selenic.com
Fix bug with co -C across branches, update tests
 r1236 %% merge of b expected
mpm@selenic.com
[PATCH] Merging identical changes from another branch...
 r407 merging for b
merging b
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Benoit Boissinot
fix traceback of extdiff after a merge...
 r3330 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