[PATCH] pbackout: fix Windows EOL problem in temporary patch file (closes #56)

Peter Arrenbrecht peter.arrenbrecht at gmail.com
Mon Dec 13 08:50:57 CST 2010


On Sat, Nov 27, 2010 at 8:45 AM, Peer Sommerlund
<peso at users.sourceforge.net> wrote:
> # HG changeset patch
> # User Peer Sommerlund <peso at users.sourceforge.net>
> # Date 1290843273 -3600
> # Node ID 44a56a1bcab84f3314a84d720379e30a708572e3
> # Parent  81fdb8ef32dbba660f35392f7495c14f05898b2d
> pbackout: fix Windows EOL problem in temporary patch file (closes #56)

Queued, thanks.
-parren

> diff -r 81fdb8ef32db -r 44a56a1bcab8 hgext/pbranch.py
> --- a/hgext/pbranch.py  Fri Jul 02 08:32:28 2010 +0200
> +++ b/hgext/pbranch.py  Sat Nov 27 08:34:33 2010 +0100
> @@ -1335,7 +1335,7 @@
>         m = cmdutil.match(repo, pats, diffopts)
>         diff = _patch.diff(repo, thisctx.node(), basectx.node(), match=m,
>                            opts=_patch.diffopts(ui, diffopts))
> -        temp = file(tempname, 'w')
> +        temp = file(tempname, 'wb')
>         try:
>             for l in diff: temp.write(l)
>         finally:
>


More information about the Mercurial-devel mailing list