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

merging svn and nonsvn copies

From: Kamaraju S Kusumanchi <kamaraju_at_bluebottle.com>
Date: Sat, 29 Mar 2008 18:48:55 -0400

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 have to
subversioned directories.

Any ideas?


Kamaraju S Kusumanchi
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-29 23:49:31 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.