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 06348b185a6487bf78936b8f35d213c7153ddc62..f0e7574923c52e34022b3146366e2c060c0dee38 100755 (executable)
--- 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",