Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge-revert2.out @ 5429:77cafe8f89e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
findcopies: fix rename bug We've fiddled with this line several times, and an old bug has reappeared from it. Let's take a peek at the history. The original "or" (rev 3674, in 0.9.2 and 0.9.3): http://www.selenic.com/hg/rev/9103dab96093 Then I changed it to an "and" to fix a bug (rev 4304): http://www.selenic.com/hg/rev/4787e2b0dd03 Then for reasons now lost in the mists of time, I dropped half (rev 4399): http://www.selenic.com/hg/rev/93652499bed3 Then we added back the "or" (rev 4416, in 0.9.4): http://www.selenic.com/hg/rev/bb1800a7d7e1 So it seems it ought to be "and".
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Oct 2007 18:47:22 -0500
parents 93a4e72b4f83
children
line wrap: on
line source

1:f248da0d4c3e
0:9eca13a34789
f248da0d4c3e tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9eca13a34789
9eca13a34789+
reverting file1
9eca13a34789
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f248da0d4c3e tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
warning: conflicts during merge.
merging file1
merging file1 failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges with locally modified files.
You can redo the full merge using:
  hg update 0
  hg update 1
diff -r f248da0d4c3e file1
--- a/file1
+++ b/file1
@@ -1,3 +1,7 @@ added file1
 added file1
 another line of text
+<<<<<<< my
+changed file1 different
+=======
 changed file1
+>>>>>>> other
M file1
f248da0d4c3e+ tip
reverting file1
f248da0d4c3e tip
f248da0d4c3e tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
f248da0d4c3e tip