[meld] Allow arbitrary data after bzr diff header lines (closes bgo#682852)
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Allow arbitrary data after bzr diff header lines (closes bgo#682852)
- Date: Wed, 29 Aug 2012 22:18:27 +0000 (UTC)
commit c4ca0f668f3eeb1aac10b2caa048bafeb8c1a1b4
Author: Kai Willadsen <kai willadsen gmail com>
Date: Thu Aug 30 08:15:50 2012 +1000
Allow arbitrary data after bzr diff header lines (closes bgo#682852)
This commit fixes a problem where extra data (exec bit changes) was
stopping patch validation.
meld/vc/bzr.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index ac9b6e1..1c417fa 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -33,7 +33,7 @@ class Vc(_vc.CachedVc):
CMDARGS = ["--no-aliases", "--no-plugins"]
NAME = "Bazaar-NG"
VC_DIR = ".bzr"
- PATCH_INDEX_RE = "^=== modified file '(.*)'$"
+ PATCH_INDEX_RE = "^=== modified file '(.*)'.*$"
# We use None here to indicate flags that we don't deal with or care about
state_1_map = {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]