From: "Matthias Andree" <matthias.andree@gmx.de>
To: "Avery Pennarun" <apenwarr@gmail.com>,
"Jakub Narebski" <jnareb@gmail.com>
Cc: git@vger.kernel.org, "Matthieu Moy" <Matthieu.Moy@imag.fr>
Subject: Re: Merging in Subversion 1.5 (was: Re: Using git to track my PhD thesis, couple of questions)
Date: Fri, 28 Aug 2009 17:44:04 +0200 [thread overview]
Message-ID: <op.uzdpzqr11e62zd@balu.cs.uni-paderborn.de> (raw)
In-Reply-To: <32541b130908280829s6fcebbe5ja84b10e649de1eb3@mail.gmail.com>
Am 28.08.2009, 17:29 Uhr, schrieb Avery Pennarun <apenwarr@gmail.com>:
> I think they probably meant that it's the client's responsibility to
> set the property correctly, not the server's, and if your client is
> too old any you do a merge, it'll forget to set svn:mergeinfo, causing
> confusion for everyone. There's discussion in the svn book
> (http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html) but
> nothing implies that it's a non-replicated property. Indeed, I can
> see no particular reason that anyone would want it to be, for the
> reasons you specify.
It is replicated, and the common remedy against older clients is to refuse
commits from those clients that do not support mergeinfo. This is done by
defining a repository hook on the server side that validates this. AFAIR
such a hook example ships with SVN.
--
Matthias Andree
next prev parent reply other threads:[~2009-08-28 15:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-27 20:34 Using git to track my PhD thesis, couple of questions seanh
2009-08-27 20:41 ` Sverre Rabbelier
2009-08-27 20:55 ` Matthieu Moy
2009-08-28 8:34 ` Paolo Bonzini
2009-08-28 8:46 ` Matthieu Moy
2009-08-28 13:37 ` seanh
2009-08-28 13:51 ` Matthieu Moy
2009-08-28 13:54 ` Matthias Andree
2009-08-28 15:12 ` Merging in Subversion 1.5 (was: Re: Using git to track my PhD thesis, couple of questions) Jakub Narebski
2009-08-28 15:29 ` Avery Pennarun
2009-08-28 15:44 ` Matthias Andree [this message]
2009-08-28 16:19 ` Merging in Subversion 1.5 Jakub Narebski
2009-08-28 16:28 ` Matthias Andree
2009-08-28 16:34 ` Avery Pennarun
2009-08-30 19:41 ` Merging in Subversion 1.5 (was: Re: Using git to track my PhD thesis, couple of questions) Sam Vilain
2009-08-31 5:47 ` Dmitry Potapov
2009-08-28 21:42 ` Using git to track my PhD thesis, couple of questions david
2009-08-28 15:50 ` Paolo Bonzini
2009-08-28 16:12 ` demerphq
2009-08-28 21:44 ` david
2009-08-28 22:16 ` demerphq
2009-08-27 21:38 ` Junio C Hamano
2009-08-27 22:21 ` demerphq
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=op.uzdpzqr11e62zd@balu.cs.uni-paderborn.de \
--to=matthias.andree@gmx.de \
--cc=Matthieu.Moy@imag.fr \
--cc=apenwarr@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).