Add "fedpkg initial-merge" command

usage: fedpkg.py initial-merge [-h] [-n] [repo-path [repo-path ...]]

Performs a 'git merge' of all git branches with the same content
(i.e. with the same package spec files, patch files, etc.), regardless
of their history.

This is useful after Fedora's dist-cvs to dist-git migration, as often
different branches have different histories but the same content on the
filesystem.

After these initial merges of identical trees, future merges between
the branches will be a lot easier: Easier to follow in the dependency
graph, and easier to perform without conflicts.

positional arguments:
  repo-path      Path to a repo to initial-merge

optional arguments:
  -h, --help     show this help message and exit
  -n, --dry-run  Whether to run without actually merging

1 files changed, 3 insertions, 0 deletions

diff --git a/src/fedpkg.py b/src/fedpkg.py
index 4bd565f..c897b4c 100755
--- a/src/fedpkg.py
+++ b/src/fedpkg.py
@@ -1039,6 +1039,9 @@ packages will be built sequentially.
                                     help = 'Source rpm to import')
     parser_import_srpm.set_defaults(command = import_srpm)
 
+    # Initial branch merges
+    pyfedpkg.initial_merge.add_parser_to(subparsers)
+
     # install locally
     parser_install = subparsers.add_parser('install',
                                         help = 'Local test rpmbuild install')