Re: merging - VSS to SVN...
On 3/31/07, Kenneth Porter <firstname.lastname@example.org> wrote:
> --On Wednesday, March 14, 2007 5:46 PM -0500 Andrew Close
> <email@example.com> wrote:
> > what we've attempted to do is create a branch in SVN off of the
> > Project A codebase. checkout branch A' to a local workspace. overlay
> > the A' workspace with the source from the VSS repository and
> > add/commit so that A' now matches what came from VSS. we then attempt
> > to merge branch A' with A, but the merge appears to just overwrite the
> > code in A with A' even though there should be conflicts that need
> > resolving.
> What you want is a "vendor branch":
> Consider your VSS project to be your vendor. A checkout from VSS represents
> a "vendor drop".
> I used this with one of my customers before they switched to Subversion.
> (At that point I changed from a VSS checkout to a Subversion export to get
> a snapshot of their current development.)
thanks Kenneth, i'll read that section of the redbook.
in moving to SVN we'll be changing our directory structure so it won't
really be a one to one correlation between branches. we'll have to do
a bit of massaging, but that isn't a big deal.
i was more concerned with the merge process, for which i still haven't
found a good solution. right now our VSS merges between branches are
painfully manual and involve several days of merging to a common
branch. i was really hoping to have a more automated solution for the
merge into SVN. but if we have to manually merge for the time being
we'll deal with it. hopefully once we have everything in one SVN
repository we'll be able to make use of the branching and merging
features SVN provides and cut down on some of that manual work.
To unsubscribe, e-mail: firstname.lastname@example.org
For additional commands, e-mail: email@example.com
Received on Sat Mar 31 16:35:25 2007
This is an archived mail posted to the Subversion Users