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

RE: Reintegrate issue with v1.6.5

From: Erik Hemdal <erik_at_comprehensivepower.com>
Date: Fri, 4 Sep 2009 13:12:35 -0400

> -----Original Message-----
> From: Bob Archer [mailto:bob.archer_at_amsi.com]
> Hmm... is there mergeinfo on DEV_BRANCH/folder1 and
> DEV_BRANCH/folder2? If so, they will need to include the
> range 320-361 also. When you did you record-only merge did it
> update mergeinfo on folder1 and folder2?

Yes, it did, and I committed the changes. However, after seeing the
mergeinfo change, I still got the error.

> Another thing you
> could do is remove the merge info from DEV_BRANCH/folder1 and
> DEV_BRANCH/folder2 making sure that all the merge info is on
> the DEV_BRANCH folder.

I'm going to try this. I suspect I might have some subtree mergeinfo from
some other operations. Thanks!

> BOb
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&

To unsubscribe from this discussion, e-mail:


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-04 19:13:48 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.