Steven Walter f271fad266 git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip ... Consider the case where you have trunk, branch1 of trunk, and branch2 of branch1. trunk is merged back into branch2, and then branch2 is reintegrated into trunk. The merge of branch2 into trunk will have svn:mergeinfo property references to both branch1 and branch2. When git-svn fetches the commit that merges branch2 (check_cherry_pick), it is necessary to eliminate the merged contents of branch1 as well as branch2, or else the merge will be incorrectly ignored as a cherry-pick. Signed-off-by: Steven Walter <stevenrwalter@gmail.com> Reviewed-by: Sam Vilain <sam@vilain.net> Signed-off-by: Eric Wong <normalperson@yhbt.net>		2012-10-05 22:48:12 +00:00
..
Git	git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip	2012-10-05 22:48:12 +00:00
.gitignore	perl: detect new files in MakeMaker builds	2012-07-27 22:14:02 +00:00
Git.pm	correct spelling: an URL -> a URL	2012-03-28 08:47:23 -07:00
Makefile	Extract Git::SVN::GlobSpec from git-svn.	2012-07-27 22:36:19 +00:00
Makefile.PL	The Makefile.PL will now find .pm files itself.	2012-07-27 22:13:28 +00:00
private-Error.pm	Assorted typo fixes	2007-02-03 21:49:54 -08:00