# How to merge branches with git-svn without loosing svn-properties

1 messages from 2016-02-18 to 2016-02-18. Participants: Juergen Kosel.
Thread: https://gitlist.dev/t/41438

## Juergen Kosel, 2016-02-18 20:56

Subject: How to merge branches with git-svn without loosing svn-properties
Message-ID: <56C62FEF.6000504@gmx.de>
URL: https://gitlist.dev/e/56C62FEF.6000504%40gmx.de

```
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hello,

could you please give me some recommendations how to merge two
branches in a git-svn repository, without loosing svn-properties?

As the git-svn man-page says:

> We ignore all SVN properties except svn:executable. Any unhandled
> properties are logged to $GIT_DIR/svn/<refname>/unhandled.log

Therefore I expect the following:
If branch A is merged by git into branch B any modified property
(except svn:executable and svn:mergeinfo) is not merged by git
automatically.
If I know that in branch A some property was set (e.g. svn-eol-style
or svn:keywords), than I could re-add the property manually by calling

	git svn propset

But usually I do not know. In this case it would be nice to have some
script which iterates over all files and compares the properties for
each file in the 2 branches.
Is there already such a tool?


Greetings
	Juergen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
Comment: Using GnuPG with Icedove - http://www.enigmail.net/

iD8DBQFWxi/vYZbcPghIM9IRApUpAJ9TFKagQUPdSx3QQZn5Cygb40G2TwCgkrWz
7+28Llb0IAo97gfNTSYIdG4=
=W2u9
-----END PGP SIGNATURE-----

```