From: Juergen Kosel <juergen.kosel@gmx.de>
To: git@vger.kernel.org
Subject: How to merge branches with git-svn without loosing svn-properties
Date: Thu, 18 Feb 2016 21:56:15 +0100 [thread overview]
Message-ID: <56C62FEF.6000504@gmx.de> (raw)
-----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-----
reply other threads:[~2016-02-18 21:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56C62FEF.6000504@gmx.de \
--to=juergen.kosel@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.