diff options
author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2010-08-09 15:14:08 +0200 |
---|---|---|
committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2010-08-09 15:14:08 +0200 |
commit | d98955d508b3541ec80b8cbbd8a315fe349d18b0 (patch) | |
tree | 351b89dd2eab92721abba22e165d72c37be2f446 /src/fedpkg.py | |
parent | 63570e8513a930a3d61cf8f3b07fe6cfdd8a1d2c (diff) | |
download | fedora-packager-d98955d508b3541ec80b8cbbd8a315fe349d18b0.tar.gz fedora-packager-d98955d508b3541ec80b8cbbd8a315fe349d18b0.tar.xz fedora-packager-d98955d508b3541ec80b8cbbd8a315fe349d18b0.zip |
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
Diffstat (limited to 'src/fedpkg.py')
-rwxr-xr-x | src/fedpkg.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/fedpkg.py b/src/fedpkg.py index 08d3274..ec04620 100755 --- a/src/fedpkg.py +++ b/src/fedpkg.py @@ -939,6 +939,9 @@ packages will be built sequentially. ' name-version-release') parser_verrel.set_defaults(command = verrel) + # Initial branch merges + pyfedpkg.initial_merge.add_parser_to(subparsers) + # Parse the args args = parser.parse_args() |