| commit | fd440f0e6b812eb97b7b43688cda6ef3c4747bc6 | |
| author | Benoit Sigoure <tsuna@lrde.epita.fr> | |
| Sun, 20 Jan 2008 08:55:12 +0000 (20 09:55 +0100) | ||
| committer | Benoit Sigoure <tsuna@lrde.epita.fr> | |
| Sun, 20 Jan 2008 08:55:12 +0000 (20 09:55 +0100) | ||
| tree | 9990b970ddc7d42f422388aa079ae914f715efc1 | treesnapshot (tar.gz zip) |
| parent | 5c632579156d041a33997585d3673f1c3d7424dd | commitdiff |
Find the merge parent faster.
* svn-merge2git.sh (find_merge_parent): Generate an ERE that
intelligently matches the possible merge parents so that the first
commit found by rev-list is the merge parent (instead of finding all
the commits in the merged branch and piping this all through a Perl
script that finds the good parent).
(rewrite_history): Make sure that filter-branch does not fail.
(top-level aka `main'): Count the total number of commits processed.
Signed-off-by: Benoit Sigoure <tsuna@lrde.epita.fr>
* svn-merge2git.sh (find_merge_parent): Generate an ERE that
intelligently matches the possible merge parents so that the first
commit found by rev-list is the merge parent (instead of finding all
the commits in the merged branch and piping this all through a Perl
script that finds the good parent).
(rewrite_history): Make sure that filter-branch does not fail.
(top-level aka `main'): Count the total number of commits processed.
Signed-off-by: Benoit Sigoure <tsuna@lrde.epita.fr>
| svn-merge2git.sh | diffblobblamehistory |