merging svn and nonsvn copies

[Kamaraju S Kusumanchi <ka...@bluebottle.com>]

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?

thanks
raju
-- 
Kamaraju S Kusumanchi
http://www.people.cornell.edu/pages/kk288/
http://malayamaarutham.blogspot.com/


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: merging svn and nonsvn copies

[marc gonzalez-carnicer <ca...@gmail.com>]

i also have this same type of problem. not to cooperate with
somebody else, but with myself, when i am offline to my
corporate repo.

i know of 2 workarounds. i have been able to use only
the first one, and apparently the 3rd seems to be the ideal solution.

1. export, work with another svn serve (or any other type of
VCS, including tar.gz). actually what i mostly use in these offline time
lapses is bzr, which allows me to commit without connection to
a server. you have to remember if you deleted, added or renamed
any of the files. therefore it is not elegant. but for small time lapses
it's quite fine.

2. use git-svn. on the (in)"famous", though interesting google video
featuring linus torvalds, it is claimed that it is the solution. i have not
been able to try it because our corporate svn server uses only the
svn protocol, and git-svn does not know how to handle it, it only works
with http.

if anyone has tried git-svn for that, i'd like to hear comments.




2008/3/29, Kamaraju S Kusumanchi <ka...@bluebottle.com>:
> 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?
>
>  thanks
>  raju
>  --
>  Kamaraju S Kusumanchi
>  http://www.people.cornell.edu/pages/kk288/
>  http://malayamaarutham.blogspot.com/
>
>
>  ---------------------------------------------------------------------
>  To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>  For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: merging svn and nonsvn copies

[Ryan Schmidt <su...@ryandesign.com>]

On Mar 29, 2008, at 17:48, Kamaraju S Kusumanchi wrote:

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

Instead of giving X an export, give them a working copy. When they  
send it back, you can use "svn st" and "svn di" to see their changes.

Or, encourage X to use Subversion.


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

RE: merging svn and nonsvn copies

["Reedick, Andrew" <jr...@ATT.COM>]

> -----Original Message-----
> From: news [mailto:news@ger.gmane.org] On Behalf Of Kamaraju S
> Kusumanchi
> Sent: Saturday, March 29, 2008 6:49 PM
> To: users@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
have
> 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
version 
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@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org