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> | 2011-02-01 16:23:45 +0100 |
| commit | c139cc05d3101187d7292e220b1734bb03be99da (patch) | |
| tree | b17587f22b22647134ab3143498e47bd70a5cdc4 /src/pyfedpkg/__init__.py | |
| parent | aa4ed2b47671786c2d651e2f0604fd18f7ab74a6 (diff) | |
| download | fedora-packager-c139cc05d3101187d7292e220b1734bb03be99da.tar.gz fedora-packager-c139cc05d3101187d7292e220b1734bb03be99da.tar.xz fedora-packager-c139cc05d3101187d7292e220b1734bb03be99da.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 76b4e5d..83b54f7 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -31,6 +31,8 @@ import OpenSSL import fnmatch import offtrac +from . import initial_merge + # Define some global variables, put them here to make it easy to change LOOKASIDE = 'http://pkgs.fedoraproject.org/repo/pkgs' |