Fixing SVN import merges

From: fREW Schmidt <hidden>
Date: 2016-06-15 22:49:54

Hey guys,

We are doing a fairly extensive import from an svn (with svk
sometimes) repo, and I wanted to fix the merge messages that svk
generates.

I thought I could use filter-branch with --msg-filter and do something
along the lines of:

 #!/usr/bin/perl
 my @parents = split / /, `git log -1 --pretty=%P HEAD`;
 print '', <> if @parents == 1;
 my @names = map `git name-rev --name-only $_`, @parents;
 print "Merged '$names[0]' into '$names[1]'";

But that doesn't seem to work.  I think I need to tell it to do a
no-op tree-filter for the above to work.

Also, it seems like git sometimes includes branches being merged into,
sometimes doesn't.  Sometimes quotes branch names, and sometimes
doesn't.  Anyone know what the rules are there?

Lastly, any other comments are very welcome.

--
fREW Schmidt
http://blog.afoolishmanifesto.com
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help