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

RE: merging svn and nonsvn copies

From: Reedick, Andrew <jr9445_at_ATT.COM>
Date: Mon, 31 Mar 2008 09:02:17 -0500

> -----Original Message-----
> From: news [mailto:news_at_ger.gmane.org] On Behalf Of Kamaraju S
> Kusumanchi
> Sent: Saturday, March 29, 2008 6:49 PM
> To: users_at_subversion.tigris.org
> Subject: merging svn and nonsvn copies
> I have a project (say P) that I manage under subversion. For the
> project I
> also collaborate with another person (say X). X does not use
> subversion.
> So I end up
> 1) making a "svn export" when my part is complete, give it to X (in
> a .tar.gz format).
> 2) X makes some changes and gives it back to me.
> 3) I unzip the new tar.gz directory
> 4) copy it by rsync to my working copy
> 5) then commit the changes to the repository from working copy
> I am wondering if there is an svn way of doing step 4. Here I am
> essentially
> merging changes between an svn copy, and a nonsvn copy. Can this be
> done by
> svn? I looked in svn merge's help but there both initial arguments
> to
> subversioned directories.

1) Create X-branch.
2) Export from X-branch and send tar to X.
3) Get updated code back from X.
4) Check updated code into branch X.
5) Merge from branch X into your working copy/branch.

Plan B:
Make X install subversion so that he can do/export his own work on the X
branch in a workspace. (I'm guessing that X is using a different
control system?) In theory 'svn co' and 'svn ci' are easier/lazier than
dealing with 'svn export' and tar files. The only downside occurs when X
balks at having to merge your changes into his workspace (i.e. 'svn
update' creates a conflict.)

SVN is pretty lightweight (at least on the Windows side) and should
coexists easily with another version control system.


The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA621

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-03-31 16:03:20 CEST

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.