Hi all,
I have the following situation :
A public SVN server proposes the sources of a project with readonly access.
I'm working on some improvements/addons of my own but in the process of
developping these, I want to keep track of my changes so that I can
publish them only when I'm happy with them.
I thus setup my own private SVN server, did an export of the public
tree, and added all these files in the private SVN repository.
I'm doing my changes, committing revisions to my private server, all is
fine.
But of course, development does not end on the public server, and in
order to validate that my changes are still ok, I want to get the
changes from the public server and import them into my private server.
And that's where I have a problem because I'm not quite sure how to
proceed. I tried these solutions :
1. Create a diff file between the revision I exported out and HEAD from
the public server, then apply this diff file to the private repository.
This is not ok as it creates many conflicts and does not even take into
account file removal or renaming
2. Create a branch on the private server, checkout that branch locally,
export the HEAD revision of the public server on top of it, commit the
changes. Then do a merge from the branch to the head in the private
repository.
This is not ok as it overwrites the changes I have done for my current
development
3. Do a merge from the public revision from the initial checkout towards
the head of the public repository, and put the changes in the local copy
of the private repository.
This is the most approaching, but it puts all the files in a conflicted
state and sometimes the command line client (windows) even crashes.
Can anyone suggest another approach that would help me there?
Thanks a lot
Olivier
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Oct 26 13:48:21 2006