[issue261] Windows prerequisites 2

[Jonas Wallander]

New submission from Jonas Wallander <jonas.wallander at tetrapak.com>:

Thanks for the help with the "Windows prerequisites" editor issue. Here is a 
new one.

Fresh install of Mercurial 0.9 on Win XP pro. Created a repo and cloned it. 
Commited a change in the cloned repo and exported it to this foobar.patch file:

# HG changeset patch
# User SEWALLANDEJ at SETPCAHFBCT1J.tp1.ad1.tetrapak.com
# Node ID 5ff8f1eb896d8b07a8467c0a422edff34310c2cc
# Parent  495a4d38b0824a22c0ac23f700fe2cee5f749d4c
Some more text

diff -r 495a4d38b082 -r 5ff8f1eb896d textfile.txt
--- a/textfile.txt      Fri May 19 10:45:21 2006 +0200
+++ b/textfile.txt      Fri May 19 10:46:16 2006 +0200
@@ -1,2 +1,3 @@ Some text
 Some text
+Some more text

when trying to import the patch in the original repo I get an error:

C:\test>hg import ..\test6\foobar.patch
applying ..\test6\foobar.patch
abort: patch command failed: exited with status 1

Trying to get some more info:

C:\test>hg import --debug --traceback ..\test6\foobar.patch
applying ..\test6\foobar.patch
User: SEWALLANDEJ at SETPCAHFBCT1J.tp1.ad1.tetrapak.com
message:
Some more text


Traceback (most recent call last):
  File "mercurial\commands.pyc", line 3343, in dispatch
  File "mercurial\commands.pyc", line 3318, in <lambda>
  File "mercurial\commands.pyc", line 1712, in import_
  File "mercurial\util.pyc", line 107, in patch
Abort: patch command failed: exited with status 1
abort: patch command failed: exited with status 1

Looking in the source it looks like external patch program is used. Running the 
supplied patch.exe on it's own gives:

This application has failed to start because msys-1.0.dll was not found...

I installed msys and put it the path but still the same message.

Maybe I'm missing an option for the import command but the manfile is a bit 
brief on the subject. I could use some examples of what -p and -b does.

options:
-p, --strip  directory strip option for patch. This has the same
             meaning as the corresponding patch option (default:
             1)
-b, --base   base path
-f, --force  skip check for outstanding uncommitted changes

/Jonas

----------
messages: 1350
nosy: JonasW
priority: urgent
status: unread
title: Windows prerequisites 2

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue261>
____________________________________________________