Re: Merging from External Files

Hi James,

if you can figure out the revision of your code theirs is based on you
could branch your repository at that point, create a checkout, copy
their code over it and check in. You'd have to manually add/remove
files that they added /removed. Then you could use all merging
capabilities of svn to pull up that branch to a current state and then
merge from that branch back to your trunk. Depending on how much code
change and how badly the areas of work overlap that might be anywhere
between a no-brainer or a monster task.

cheers and good luck
felix

On Mar 17, 2009, at 12:18 PM, James Green wrote:

> 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=1341043

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].