[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Subtree mergeinfo

From: Michael T <raselmsh_at_hotmail.com>
Date: Wed, 19 Sep 2012 18:40:01 +0000 (UTC)

Varnau, Steve (Seaquest R&D <steve.varnau <at> hp.com> writes:
> > -----Original Message-----
> > From: Stefan Sperling [mailto:stsp <at> elego.de]
> > The easiest thing to do is to just leave the mergeinfo alone and upgrade
> > all clients to 1.7. This will get rid of superfluous mergeinfo
> > modifications during merges. See here for more information:
> > http://subversion.apache.org/docs/release-notes/1.7.html#subtree-
> > mergeinfo-recording
> Good advice. Get users on 1.7 clients! For the cases where a sub-tree was
merged, a relatively safe thing to
> do is to run the same (branches/revs) merges into the root of your trunk.
Assuming the sub-trees already
> picked up the real content changes, these additional merge changes should just
be updating the
> root-level meta-data, and if you get all such branches, then the merge-info
will elide from the sub-tree.
> Let the merge command do the dirty work, rather than edit merge-info!
Thank you both! We will presumably all end up on svn 1.7 sooner or later, and
hopefully it (or later versions) will not have too much trouble with the
not-quite-clean state of the mergeinfo. Though I can't say that anyone seems to
be suffering much with 1.5 and 1.6 apart from the annoying proliferation during
merges, so presumably things will only get better!


Received on 2012-09-19 20:40:47 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.