[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: Stein Somers <ssomers_at_opnet.com>
Date: Fri, 30 Oct 2009 17:16:40 +0100

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.

-- 
Stein
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2413046
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-30 17:18:11 CET

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