Fixing SVN import merges

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]