From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Fri, 11 May 2012 08:29:24 +0000 (+0300)
Subject: pq-rpm: add new --pq-branch option
X-Git-Tag: debian/0.6.26~39
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3c92e4edd80387294686f9351bfe43a6e6c72c98;p=tools%2Fgit-buildpackage.git

pq-rpm: add new --pq-branch option

Adds a new command line option '--pq-branch' to set the name of
patch-queue branches. Changes the defaults pq-branch name for rpm tools
to 'development/%(branch)s' (instead of the old
'patch-queue/%(branch)s').

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

Conflicts:
	gbp/config.py
	gbp/scripts/pq_rpm.py
---

diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index 06348b18..f0e75749 100755
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -627,6 +627,7 @@ def main(argv):
     parser.add_config_file_option(option_name="upstream-tag",
             dest="upstream_tag")
     parser.add_config_file_option(option_name="spec-file", dest="spec_file")
+<<<<<<< HEAD
     parser.add_config_file_option(option_name="packaging-dir",
             dest="packaging_dir")
     parser.add_option("--new-packaging-dir",