My rules of thumb for merging
(a) always use a fully populated workspace
(b) always merge from the top
By following these rules, I only get mergeinfo properties in the tops of
my workspaces.
JLM
Jeremy Mordkoff
Director, QA, IT & Release
ZeeVee, Inc.
One Monarch Drive | Littleton, MA 01460
Office: 978.467.1395 x233 | Fax: 978.467.1404
Mobile: 978-257-2183
jlm_at_zeevee.com
www.zeevee.com
> -----Original Message-----
> From: Cufi, Carles [mailto:carles.cufi_at_nordicsemi.no]
> Sent: Tuesday, May 18, 2010 10:16 AM
> To: Mark Phippard; David Aldrich
> Cc: users_at_subversion.apache.org
> Subject: RE: Is svn branching too difficult?
>
> Hi there,
>
> > Subversion is likely working properly, but yes it is confusing.
When
> > you do a merge into a branch, Subversion updates its mergeinfo
> > tracking on all of the locations that have the property set. There
> > have been numerous posts that describe how and why it gets set in
the
> > first place.
>
> Thanks for the info. As I described in an earlier post, I have a trunk
and a branch
> completely clean of svn:mergeinfo properties and then when I update my
branch with the latest
> trunk a bunch of svn:mergeinfo properties get added to a sparse set of
files. All the posts I
> have read ask people to cleanup all svn:mergeinfo in the trunk and
then start branching from
> it. I have done so but the properties keep reappearing, and this is
really confusing for me.
>
> > Because it is confusing, we have changed how Subversion works in the
> > next release. It will not update paths that were not modified by
the
> > merge, and then Subversion was modified to handle the fact that
these
> > paths do not get their merge tracking information updated.
>
> Excellent! Looking forward to that!
>
> Thanks!
>
> Carles
Received on 2010-05-18 23:09:44 CEST