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-13 14:03:09 +0200 |
| commit | 648e2fed076a881d1658f6d70dac9639c377cbfc (patch) | |
| tree | 34532c03a5adb10b826b7e42dc20df8a2736744e /src/pyfedpkg/__init__.py | |
| parent | 279d7c33511b971962c340cdb867feebdc77950e (diff) | |
| download | fedora-packager-648e2fed076a881d1658f6d70dac9639c377cbfc.tar.gz fedora-packager-648e2fed076a881d1658f6d70dac9639c377cbfc.tar.xz fedora-packager-648e2fed076a881d1658f6d70dac9639c377cbfc.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/pyfedpkg/__init__.py')
| -rw-r--r-- | src/pyfedpkg/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index 19d1c5c..dbd0878 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -28,6 +28,8 @@ import stat import StringIO import OpenSSL +from . import initial_merge + # Define some global variables, put them here to make it easy to change LOOKASIDE = 'http://pkgs.fedoraproject.org/repo/pkgs' |