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

Re: merging - VSS to SVN...

From: Kenneth Porter <shiva_at_sewingwitch.com>
Date: 2007-03-31 07:08:02 CEST

--On Wednesday, March 14, 2007 5:46 PM -0500 Andrew Close
<aclose@gmail.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.)

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Mar 31 07:09:04 2007

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.