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

Re: Advice Needed: Merging Branch back into Trunk

From: Richard In Public <edification_at_blueyonder.co.uk>
Date: 2003-04-01 22:58:42 CEST

Hi

1. Thanks for busting yet another of my subversion fallacies...
2. I'm still having the following problem:

Run from within the checked out trunk svn merge -r 33:HEAD
http://europad/svn/henrys-brown-boxes/branches/hostway .

responds with:

svn: RA layer request failed
svn: REPORT request failed on '/svn/henrys-brown-boxes/branches/hostway'
svn: The REPORT request returned invalid XML in the response: Unknown XML
element `error (in DAV:)'. (/svn/henrys-brown-boxes/branches/hostway)

I suspect that this is because revision 33 was created with an earlier
version of SVN. This seems to be confirmed by the fact that this command
works if I use substitute version 55 for version 33.

Instructions in The Guide (which I've just reread) require that the old
repository is exported with the earlier version of SVN. Unfortunately, I
ahven't been doing so so my repository has been modified by quite a few SVN
versions. Is there any way of recovering from this problem?

TIA,

Richard

----- Original Message -----
From: "Ben Collins-Sussman" <sussman@collab.net>
To: "Richard In Public" <edification@blueyonder.co.uk>
Cc: <dev@subversion.tigris.org>
Sent: Tuesday, April 01, 2003 7:44 PM
Subject: Re: Advice Needed: Merging Branch back into Trunk

> "Richard In Public" <edification@blueyonder.co.uk> writes:
>
> > What I'm trying is the following:
> >
> > 1. Create a new directory into which I checkout .../branches/mybranch
> > 2. Merge the branch into this wc, thus (executed within the new
directory):
> >
> > svn merge http://myserver/svn/myrepos/trunk
> > http://myserver/svn/myrepos/branches/mybranch .
> > 3. Commit this directory.
>
> This is a common fallacy.
>
> Suppose you have /trunk, then copy it to /mybranch. Then you make
> changes on /mybranch for a while, and want to merge the branch back
> into the trunk.
>
> 'svn merge' compares two URLs, and merges the diffs into a working
> copy as a local mod.
>
> That means that to begin with, you need a working copy of /trunk.
>
> Then you want to compare *two versions of the branch* to generate the
> diffs. You do *not* want to compare /trunk and /branch, which is what
> you're doing above.
>
> In other words, you want to do something like this:
>
> $ svn co http://.../trunk
>
> $ svn merge http://.../branch@X http://.../branch@Y .
>
> $ svn commit
>
> X is the revision in which /branch was first created, and Y is
> typically HEAD.
>
> If you repeat this merge later on, you have to be careful not to
> remerge changes that were applied already. You need to compare
> /branch@(Y+1) with /branch@HEAD.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Apr 1 22:59:25 2003

This is an archived mail posted to the Subversion Dev mailing list.