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

Please help me figure out merging strategy after a 1.4 => 1.5+ transition

From: Jamie Jackson <myspamb8_at_gmail.com>
Date: Wed, 17 Jun 2009 21:48:05 -0400

Hi Folks,

We migrated from server version 1.4 to 1.5+ earlier in the year (3-4
months ago). However, it wasn't until a couple days ago that we
started filtering out <1.5 (auto-merge-unaware) clients with a commit
hook. Therefore, we've had a mix of merge-aware and merge-unaware
clients using the repos for a while now. I think that people stuck
with old-school merging techniques during this time, but still, I
guess the new clients would have been leaving behind some merge info.

Now, I'm trying to figure out how to get our projects in a proper
state, so that we can begin to use merge management. Could you help me
come up with a strategy for what to do with our projects in order to
get everything reconciled and ready to go?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-18 03:49:12 CEST

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