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

Merging from External Files

From: James Green <James.Green_at_occam-dm.com>
Date: Tue, 17 Mar 2009 11:18:26 -0000

Hi All,
 
I've just had a rather alarming conversation with my boss about a
particular scenario regarding our SVN repositories.
 
Basically we have a third party organisation doing some outsourced
development on a project I am just in the process of wrapping up. I
have a direct link to my SVN repos and once code is
written/tested/approved I perform a commit and send the code to the
repo. I'm just about to complete this current phase of dev work and
will then hand over day to day dev to the outsourcer.
 
I've just found out that they have already been working on an old
version of my code from 'a few months ago' also completely outside of
our source control SVN repos.
 
Great ...
 
How on earth am I going to deal with this scenario? Is there any way to
reliably merge these files with what is inside our SVN server? Or is
this just a completely lost cause?
 
Yours,
 
A rather worried developer from the UK, aka James :O|

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1340194

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-03-17 12:19:28 CET

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.