Patchwork copies: fix misaligned lines

login
register
mail settings
Submitter Gábor Stefanik
Date Aug. 22, 2017, 2:16 p.m.
Message ID <3b8c9025f9b966a3e583.1503411410@GSTEFANIK.NavnGo.local>
Download mbox | patch
Permalink /patch/23204/
State Accepted
Headers show

Comments

Gábor Stefanik - Aug. 22, 2017, 2:16 p.m.
# HG changeset patch
# User Gábor Stefanik <gabor.stefanik@nng.com>
# Date 1503411399 -7200
#      Tue Aug 22 16:16:39 2017 +0200
# Node ID 3b8c9025f9b966a3e58334024c3f7b3136f500fe
# Parent  e02a08d63ad20097419f935fdd8a91c42ecd88e3
copies: fix misaligned lines

________________________________
 This message, including its attachments, is confidential and the property of NNG Llc. For more information please read NNG's email policy here:
http://www.nng.com/emailpolicy/
By responding to this email you accept the email policy.
Yuya Nishihara - Aug. 23, 2017, 1:47 p.m.
On Tue, 22 Aug 2017 16:16:50 +0200, Gábor Stefanik wrote:
> # HG changeset patch
> # User Gábor Stefanik <gabor.stefanik@nng.com>
> # Date 1503411399 -7200
> #      Tue Aug 22 16:16:39 2017 +0200
> # Node ID 3b8c9025f9b966a3e58334024c3f7b3136f500fe
> # Parent  e02a08d63ad20097419f935fdd8a91c42ecd88e3
> copies: fix misaligned lines

Queued, thanks.

These patches couldn't be applied directly from mbox. The .rej file contains
^M (CR), but no idea why.

Patch

diff -r e02a08d63ad2 -r 3b8c9025f9b9 mercurial/copies.py

--- a/mercurial/copies.py       Tue Aug 22 16:08:31 2017 +0200

+++ b/mercurial/copies.py       Tue Aug 22 16:16:39 2017 +0200

@@ -379,7 +379,7 @@ 

     # if we have a dirty endpoint, we need to trigger graft logic, and also
     # keep track of which endpoint is dirty
     dirtyc1 = not (base == _c1 or base.descendant(_c1))
-    dirtyc2 = not (base== _c2 or base.descendant(_c2))

+    dirtyc2 = not (base == _c2 or base.descendant(_c2))

     graft = dirtyc1 or dirtyc2
     tca = base
     if graft: