{"thread":{"id":"25553","subject":"Fixing SVN import merges","startedAt":"2010-10-26T19:50:28Z","lastAt":"2010-10-26T19:50:28Z","messageCount":1,"participants":["fREW Schmidt"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"154460","messageId":"AANLkTikO3fnBapx_=H3172bL+J9ux-LC3f5Bdi1R9-sq@mail.gmail.com","threadId":"25553","inReplyTo":null,"subject":"Fixing SVN import merges","fromName":"fREW Schmidt","fromEmail":"frioux@gmail.com","sentAt":"2010-10-26T19:50:28Z","receivedAt":"2010-10-26T19:50:28Z","isPatch":false,"sender":{"key":"frioux@gmail.com","avatar":"https://gravatar.com/avatar/639ef3cc221c7f2c225568697bc9d42be4d4e3bada6b4a3b9c32685548f3c105?d=mp&s=160"},"body":"Hey guys,\n\nWe are doing a fairly extensive import from an svn (with svk\nsometimes) repo, and I wanted to fix the merge messages that svk\ngenerates.\n\nI thought I could use filter-branch with --msg-filter and do something\nalong the lines of:\n\n #!/usr/bin/perl\n my @parents = split / /, `git log -1 --pretty=%P HEAD`;\n print '', <> if @parents == 1;\n my @names = map `git name-rev --name-only $_`, @parents;\n print \"Merged '$names[0]' into '$names[1]'\";\n\nBut that doesn't seem to work.  I think I need to tell it to do a\nno-op tree-filter for the above to work.\n\nAlso, it seems like git sometimes includes branches being merged into,\nsometimes doesn't.  Sometimes quotes branch names, and sometimes\ndoesn't.  Anyone know what the rules are there?\n\nLastly, any other comments are very welcome.\n\n--\nfREW Schmidt\nhttp://blog.afoolishmanifesto.com\n"}]}