[Python-apps-commits] r8514 - in packages/hg-git/trunk/debian/patches (1 file)

[fqj1994-guest at users.alioth.debian.org]

    Date: Monday, April 23, 2012 @ 04:47:23
  Author: fqj1994-guest
Revision: 8514

hg-git - pathces updated.

Modified:
  packages/hg-git/trunk/debian/patches/000-fix-line-split-error-on-bad-data-from-rebase.diff

Modified: packages/hg-git/trunk/debian/patches/000-fix-line-split-error-on-bad-data-from-rebase.diff
===================================================================
--- packages/hg-git/trunk/debian/patches/000-fix-line-split-error-on-bad-data-from-rebase.diff	2012-04-22 20:13:55 UTC (rev 8513)
+++ packages/hg-git/trunk/debian/patches/000-fix-line-split-error-on-bad-data-from-rebase.diff	2012-04-23 04:47:23 UTC (rev 8514)
@@ -1,18 +1,15 @@
-# HG changeset patch
-# User Sean Farley <sean at mcs.anl.gov>
-# Date 1333220106 18000
-# Node ID 797a3584c78f8b2c35c47d77ef37af4c0471e842
-# Parent  163ac98569d35d36cee4e5737ae6772b41f5d1d3
+# Patches taken from upstream.
+# Commit 797a3584c78f and 4ed0d8dac637
+# From http://bitbucket.org/durin42/hg-git
 git_handler: fix line.split error when bad data from a rebase is in the log
 
-diff -r 163ac98569d35d36cee4e5737ae6772b41f5d1d3 -r 797a3584c78f8b2c35c47d77ef37af4c0471e842 hggit/git_handler.py
 --- a/hggit/git_handler.py	Thu Feb 23 13:49:07 2012 -0500
 +++ b/hggit/git_handler.py	Sat Mar 31 13:55:06 2012 -0500
 @@ -1065,6 +1065,8 @@
                  if line == '':
                      continue
  
-+                if ' : ' in line:
++                if ' : ' not in line:
 +                    break
                  command, data = line.split(" : ", 1)