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

RE: Using temporary branches and mergeinfo properties

From: Bob Archer <bob.archer_at_amsi.com>
Date: Fri, 30 Oct 2009 12:23:53 -0400

> Your thread has been somewhat merged into "svn 1.5 merge -c revision
> and svn
> diff/log confusion"...
> Igor Markovic wrote:
> > After upgrading to subversion 1.6.5 (we previously used subversion
> > 1.4.2)
> Assuming that you are merging full working copies, no subtrees, then
> this
> shouldn't be a problem. Although you can also follow Bob's method 2 and
> 3 (no
> mergeinfo at all).
> Are you sure nobody has secretly been using some 1.5.x client? I'm not
> sure
> the occurrence spurious mergeinfo is limited to 1.5.x versions, but I
> haven't
> seen it in 1.6.x. But if someone ever unknowingly committed spurious
> mergeinfo, it's not going away by itself.

It is probably possible to go through the log of trunk and see when these properties were introduced. At that point you will know who commit a merge at that point. You can get with them and make sure they are using 1.6 and know to merge from the root folders rather than at a child level or file level.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-30 17:24:54 CET

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