RE: Synchronizing two branches

On Sat, 2004-06-26 at 17:16, Casper Hornstrup wrote:

> I should have created the branch directory first using svn mkdir, committed, and
> then imported the sources to it or done it completely differently?

I think I'm completely confused about what you're trying to do. I
assumed that you were doing the "standard" SCM branching/merging thing:

  * import some code to /trunk.
  * copy /trunk to /branches/somebranch
  * make changes to both the trunk and somebranch over many days.
  * "port" all the changes made on somebranch back to the trunk.

But it seems like that's not what you're doing. You don't have two
lines of development evolving independently at all.

Are you simply importing two independent trees into two directories, and
then wanting to 'sync' them? If so, there's no history in either branch
to work from. What does 'sync' mean? What do you want to happen?
Sorry for my confusion.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jun 27 00:35:41 2004