[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: marc gonzalez-carnicer <carnicer.lists_at_gmail.com>
Date: Sun, 30 Mar 2008 22:21:33 +0100

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 <kamaraju_at_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_at_subversion.tigris.org
> For additional commands, e-mail: users-help_at_subversion.tigris.org
>
>

---------------------------------------------------------------------
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-30 23:21:56 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.