[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Synchronizing two branches

From: Casper Hornstrup <chorns_at_users.sourceforge.net>
Date: 2004-06-26 20:48:45 CEST

 

> -----Original Message-----
> From: Ben Collins-Sussman [mailto:sussman@collab.net]
> Sent: 26. juni 2004 17:19
> To: Casper Hornstrup
> Cc: users@subversion.tigris.org
> Subject: RE: Synchronizing two branches
>
> On Sat, 2004-06-26 at 08:30, Casper Hornstrup wrote:
>
> > Okay, from reading chapter 4, I believe what I want is:
> > svn merge --ignore-ancestry http://server/repos/branchA
> > http://server/repos/branchB
>
> Nope, you've made the "classic mistake". If you compare the
> latest versions of both branches, you're defining a "patch" which
>
> * adds all the changes that happened on branch B
> * removes all the changes that happened on branch A.
>
> Take a look at the beginning of this section of the book,
> these first few paragraphs in "Merging a whole branch to another":
>
> http://svnbook.red-bean.com/svnbook/ch04s04.html#svn-ch-4-sect-4.1
>
> To get the patch you want, you must compare the beginning of
> the branch with the end of the branch; then apply that patch
> to a working copy of the *other* branch.

I think I have tried that before without success. Svn just returns to
the prompt. The command is correct right? I want to sync
checkin/trunk/reactos to vendor/reactos/20040628/reactos.
HEAD is r33 btw.

C:\svntest\svncshconsultdk\newrepos\checkin\trunk\reactos>svn log
https://svn.csh-consult.dk/reactos/vendor/reactos/20040628/reactos
------------------------------------------------------------------------
r33 | chorns | 2004-06-26 02:09:53 +0200 (Sat, 26 Jun 2004) | 1 line

ReactOS 20040626
------------------------------------------------------------------------

C:\svntest\svncshconsultdk\newrepos\checkin\trunk\reactos>svn merge -r 33:HEAD
https://svn.csh-consult.dk/reactos/vendor/reactos/20040628/reactos

C:\svntest\svncshconsultdk\newrepos\checkin\trunk\reactos>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jun 26 20:54:09 2004

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.