You "own" the branch, it's your private repository. You can submit
code on your branch without affecting the code on the trunk. If you
decide you don't want the branch, you can delete it. If you decide
you want it, you can "svn merge" from the trunk anytime, provided
you use tags correctly so you don't merge twice. Then when you're
ready, you can "svn merge" your branch to the trunk. If done correctly
you will only merge the changes you made on the branch.
Isn't this the end that justify your means?
________________________________
From: Tim Hill [mailto:drtimhill@comcast.net]
Sent: Monday, December 11, 2006 7:15 PM
To: Fouts Christopher (QNA RTP PT PREV)
Cc: users@subversion.tigris.org
Subject: Re: How to synchronize two subversion servers?
Sorry ... branching.
On Dec 11, 2006, at 2:42 PM, <Chris.Fouts@qimonda.com>
<Chris.Fouts@qimonda.com> wrote:
What won't work, SVK or branching?
________________________________
From: Tim Hill [mailto:drtimhill@comcast.net]
Sent: Monday, December 11, 2006 5:30 PM
To: Fouts Christopher (QNA RTP PT PREV)
Cc: users@subversion.tigris.org
Subject: Re: How to synchronize two subversion
servers?
I don't see how this would work, unless a single
folder could be in two working copies at once?
On Dec 11, 2006, at 9:35 AM,
<Chris.Fouts@qimonda.com> <Chris.Fouts@qimonda.com> wrote:
Actually there is, via SVK, as someone
pointed out. But why
not just use a branch?
________________________________
From: Tim Hill
[mailto:drtimhill@comcast.net]
Sent: Monday, December 11, 2006 11:41 AM
To: Pablo F
Cc: users@subversion.tigris.org
Subject: Re: How to synchronize two
subversion servers?
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 Tue Dec 12 15:41:14 2006