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

Read the section in the book on vendor branches... for exactly this workflow.

http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.advanced.vendorbr

BOb

From: Susan Mustafa [mailto:susan.mustafa_at_gmail.com]
Sent: Wednesday, November 11, 2009 11:14 PM
To: users_at_subversion.tigris.org
Subject: One project, Two Versions (one developed externally, one developed internally)

Hi Everyone,

I hope this is not a stupid question, as I really did do my research and I am unsure of how to go about solving this issue.

I will explain below:

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 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. 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.

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"

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???

Diff-Merge between those two projects, which are the exact complete folder structure but both have unknown changes on both sides.

Any help would greatly be appreciated. I only tried SVN, I didn't try GIT, IF taht works, please direct me to a tutorial or something of how to do the scenario above.

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?

Awaiting your reply.

Thank you,

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-12 15:43:17 CET