{"thread":{"id":"41438","subject":"How to merge branches with git-svn without loosing svn-properties","startedAt":"2016-02-18T20:56:15Z","lastAt":"2016-02-18T20:56:15Z","messageCount":1,"participants":["Juergen Kosel"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"278574","messageId":"56C62FEF.6000504@gmx.de","threadId":"41438","inReplyTo":null,"subject":"How to merge branches with git-svn without loosing svn-properties","fromName":"Juergen Kosel","fromEmail":"juergen.kosel@gmx.de","sentAt":"2016-02-18T20:56:15Z","receivedAt":"2016-02-18T20:56:15Z","isPatch":false,"sender":{"key":"juergen.kosel@gmx.de","avatar":null},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA1\n\nHello,\n\ncould you please give me some recommendations how to merge two\nbranches in a git-svn repository, without loosing svn-properties?\n\nAs the git-svn man-page says:\n\n> We ignore all SVN properties except svn:executable. Any unhandled\n> properties are logged to $GIT_DIR/svn/<refname>/unhandled.log\n\nTherefore I expect the following:\nIf branch A is merged by git into branch B any modified property\n(except svn:executable and svn:mergeinfo) is not merged by git\nautomatically.\nIf I know that in branch A some property was set (e.g. svn-eol-style\nor svn:keywords), than I could re-add the property manually by calling\n\n\tgit svn propset\n\nBut usually I do not know. In this case it would be nice to have some\nscript which iterates over all files and compares the properties for\neach file in the 2 branches.\nIs there already such a tool?\n\n\nGreetings\n\tJuergen\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v2\nComment: Using GnuPG with Icedove - http://www.enigmail.net/\n\niD8DBQFWxi/vYZbcPghIM9IRApUpAJ9TFKagQUPdSx3QQZn5Cygb40G2TwCgkrWz\n7+28Llb0IAo97gfNTSYIdG4=\n=W2u9\n-----END PGP SIGNATURE-----\n"}]}