There is no automatic way of doing this that I'm aware of. I would
maintain two distinct working copies; one for the tigris copy and one
for your local copy. Then, when you want to push changes from one to
the other, use a regular diff command to merge edits, and then merge
via subversion.
--Tim
On Dec 7, 2006, at 11:40 AM, Pablo F wrote:
> Hi all,
>
> I have a conceptual problem about subversion. The issue is that I
> want to download the source code of a project and import it into my
> personal subversion server to develop by myself the code. But I
> want to update the modifications of the project in my personal
> subversion server as well. I explain with more details in the
> following lines:
>
> 1. Checkout from, say tigris.org to tmp1 (to simplify the case I
> suppose the project has only a file)
>
> /tmp1$: svn checkout http://svn.tigris.org/repos/svn/trunk/
> project1 (version 234)
>
> 2. List the files I downloaded:
>
> ls /tmp/tmp1
> .svn
> file1
>
> 3. I delete all .svn directories of tmp1.
> 4. I import the result to my server:
> /tmp$:svn import -m "New import" tmp1 http://myserver.com/repos/test1
> 5. I work with my personal repository committing changes.
> 6. Sometime I'm in the version 20 of file1 and I want to update the
> changes of the project repository, which it's now at version 250,
> in my personal repository to make the version 21 of file1. I don't
> know how to manage this. There is a special solution of how to
> synchronise these two servers?
>
> Thanks a lot and sorry for this little mess!
>
> Pablo F.
Received on Mon Dec 11 17:50:27 2006