Re: One project, Two Versions (one developed externally, one developed internally)

On Thursday 12 November 2009, Susan Mustafa wrote:
> Project A --> Open Source Project
>
> [Hired external contractors -- for upgrades etc)
> [Hired Internal developers -in house for customizations, etc)
>
>
> Now: Received Project A -- Upgrade 1 (Consists of PROJECT A exactly with
> changes inside of it (Unknown Changes))
> Now: Have Project A--Customized in in-house SVN (Trunk) (Consists of
> PROJECT A exactly with changes inside of it (also unknown since there was
> no svn before, installed 2 days ago)

So you have two changes, one received from somewhere, one made in-house but
both based on the same data?

> So I was wondering if there is a way to do the following
>
> *Project-A- In-house - Customized
> -------> Branch Project A -- Upgrade (Complete folder structure as Project
> A, only changes unknown)
>
>
> Kindly note, that the "Upgrade" is just a [zip file/no svn] received from
> the external developers.

Note: There is a tool called svn_load_dirs which helps working with archives
of files. Also read the section about "vendor branches" in the documentation.

> So it is basically a copy of Project-A with their own changes?? How can I
> make it a branch? OR even how can I compare it using the Eclipse SVN
> utility so I can see the diff/merge abilities.

You can just check out the base version of what they used for their version.
Then, you copy over their sources, manually adding new files and deleting
removed files. You then have a working copy that contains their changes,
which you can commit or directly check in as a branch ("svn copy . URL"
syntax).

> *I tried to do the command
> svn copy http://localhost/kdrepos/project-A-Upgrade/trunk \
> svn copy http://localhost/kdrepos/projectA/branch \
> -m "Creating a branch from the upgrade internal to the project"*

Twice "svn copy" on the same commandline? That doesn't make sense.

> *This gives me the error "SVN cannot mix repository and working copy
> sources" -----> Which is understandable?*
>
> But how do I go about solving this issue???

No idea, I'd first need to know what you really typed.

> The reason I want to do a branch *NOT have to though, if there is a better
> solution of merge/diff) -- Is because I want to use Eclipse's Utility of
> Showing the differences in the SVN Repository?

You shouldn't need to, provided Eclipse can display the differences in a
working copy. All you then need to do is to get the zip file into a working
copy.

Uli

-- 
ML: http://subversion.tigris.org/mailing-list-guidelines.html
FAQ: http://subversion.tigris.org/faq.html
Docs: http://svnbook.red-bean.com/
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Sator Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**************************************************************************************
           Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2417000
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].