[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-06-26 17:18:41 CEST

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":


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.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jun 26 17:21:19 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.