| commit | 7bdb3412b7a4fdd6b3153998d483887bf7a98317 | |
| author | Benoit Sigoure <tsuna@lrde.epita.fr> | |
| Mon, 21 Jan 2008 00:00:29 +0000 (21 01:00 +0100) | ||
| committer | Benoit Sigoure <tsuna@lrde.epita.fr> | |
| Mon, 21 Jan 2008 00:15:37 +0000 (21 01:15 +0100) | ||
| tree | 6b12babc0f1bce3ae11038fd600f227fa36c3db5 | treesnapshot (tar.gz zip) |
| parent | d71f4de42e8f2d024bfb35cadeae1534e48b056e | commitdiff |
Handle user-specified merges and exclusions.
* svn-merge2git.sh ($OPTIONS_SPEC): Handle -m, --merge, -x,
--exclude.
(find_merge_parent): Adjust to use user-defined merges.
(doit): Rule out user-excluded commits. Detect user-defined merges
for find_merge_parent.
Signed-off-by: Benoit Sigoure <tsuna@lrde.epita.fr>
* svn-merge2git.sh ($OPTIONS_SPEC): Handle -m, --merge, -x,
--exclude.
(find_merge_parent): Adjust to use user-defined merges.
(doit): Rule out user-excluded commits. Detect user-defined merges
for find_merge_parent.
Signed-off-by: Benoit Sigoure <tsuna@lrde.epita.fr>
| svn-merge2git.sh | diffblobblamehistory |