--- a/mercurial/merge.py Tue Aug 22 16:47:27 2006 -0500
+++ b/mercurial/merge.py Tue Aug 22 17:08:38 2006 -0500
@@ -121,11 +121,6 @@
for f in added + modified + unknown:
mw[f] = ""
- # is the wfile new and matches m2?
- if (f not in m1 and f in m2 and
- not repo.file(f).cmp(m2[f], repo.wread(f))):
- mw[f] = m2[f]
-
mw.set(f, util.is_exec(repo.wjoin(f), mw.execf(f)))
for f in deleted + removed:
--- a/tests/test-merge1.out Tue Aug 22 16:47:27 2006 -0500
+++ b/tests/test-merge1.out Tue Aug 22 17:08:38 2006 -0500
@@ -1,6 +1,8 @@
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
+merging for b
+merging b
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
%% merge should fail
--- a/tests/test-up-local-change.out Tue Aug 22 16:47:27 2006 -0500
+++ b/tests/test-up-local-change.out Tue Aug 22 17:08:38 2006 -0500
@@ -137,4 +137,5 @@
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
+merging a
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved