Re: merging - VSS to SVN...

--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":

<http://svnbook.red-bean.com/nightly/en/svn.advanced.vendorbr.html>

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