Hi all,
we're currently using VSS and are planning on migrating to SVN. at
the moment we have one project using SVN and the rest of the company
is still using VSS; we're the guinea pigs. :)
one problem we're facing is that some of the code we're using
straddles VSS and SVN.
Project A started a new codebase in SVN composed of some existing code
and lots of new code. Project B is production code that still lives
in VSS for the rest of the dev team to carry on with their normal
tasks. when team B deploys to production team A wants to merge the
updates into their codebase so they don't fall too far out of sync.
this is really a simplification of what's currently going on, but i
think illustrates our problem.
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.
is this the right process? or maybe i should ask if there is 'a' process. :)
anyone have a suggestion on how to handle a situation like this? or a
doc/how-to that they could point me to? i've read through chpt 4 of
the redbook, but am apparently missing something...
thanks for any help
andy
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 14 23:46:36 2007