From c139cc05d3101187d7292e220b1734bb03be99da Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 9 Aug 2010 15:14:08 +0200 Subject: 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 --- src/pyfedpkg/__init__.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/pyfedpkg/__init__.py') 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' -- cgit From 18ea3c13dc5bcda0c086efe11809795773f5167b Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 10 Aug 2010 13:13:15 +0200 Subject: Add "fedpkg clone --initial-merge" argument --- src/pyfedpkg/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/pyfedpkg/__init__.py') diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index 83b54f7..401f738 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -31,8 +31,6 @@ 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' @@ -50,6 +48,11 @@ BRANCHFILTER = 'f\d\d\/master|master|el\d\/master|olpc\d\/master' class FedpkgError(Exception): pass + +# This module needs FedpkgError to be defined +from . import initial_merge + + # Setup our logger # Null logger to avoid spurrious messages, add a handler in app code class NullHandler(logging.Handler): -- cgit