test-import-merge.t fails on windows, applying the patch fails directly instead of matching with an offset

Simon Heimberg simohe at besonet.ch
Mon Jan 20 15:18:16 CST 2014

test-import-merge.t fails since a long time [1]. Does anybody know why
   $ hg import --exact ../a.patch
behaves differently on windows and on other os? The operation is aborted in both places, so the
repo is in the same state. But why are the messages different? Looks like the patch does not
match at all on windows. Does the patch have different line ends, a leading bom, ...?

The failure message:

--- c:\Users\buildbot\w2k8\Windows_2008_R2_hg_tests__stable_\build\tests\test-import-merge.t
+++ c:\Users\buildbot\w2k8\Windows_2008_R2_hg_tests__stable_\build\tests\test-import-merge.t.err
@@ -142,10 +142,9 @@
    applying ../a.patch
    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    patching file a
-  Hunk #1 succeeded at 1 with fuzz 1 (offset -1 lines).
-  transaction abort!
-  rollback completed
-  abort: patch is damaged or loses information
+  Hunk #1 FAILED at 0
+  1 out of 1 hunks FAILED -- saving rejects to file a.rej
+  abort: patch failed to apply
    $ hg verify
    checking changesets

[1] The first failure is before "stable" build 26 [2] and "default" 
build 42 [3]. The runs before have failed, so no more exact information 
is present.

More information about the Mercurial-devel mailing list