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

Re: svn merge question

From: Michael Wood <mwood_at_its.uct.ac.za>
Date: 2003-01-06 08:39:02 CET

On Sun, Jan 05, 2003 at 05:59:19PM -0800, Rob Clark wrote:
> I've got a question (perhaps problem?) with 'svn merge', which I
> can't figure out from looking at the book. What I've done is
>
> 1) copied the trunk to /branches/OBJS1

which creates rev 2, say.

> 2) 'svn co https://.../branches/OBJS1'
> 3) modified some files, removed files, added files, etc. and checked
> in back to the branch

e.g. rev 5.

> now I am trying to merge the changes back to the trunk by:
>
> 1) svn co https://.../trunk
> 2) cd trunk
> 3) svn merge https://.../trunk https://.../branches/OBJS1 .

I have never used merge and have not read the book :) but I believe this
should be:

$ svn merge -r2:5 https://.../branches/OBJS1 .

You don't want to merge the differences between trunk and the branch
into your working copy (since trunk might have changed since you
branched.) You want to merge the differences between the revision that
you branched and the revision that you finished working on the branch
into your working copy and then commit that to the trunk.

Your command should still not segfault, though, and maybe it should even
work if no changes have been made to trunk after rev 1.

> the third step segfaulted (stack trace below). I tried again, with the
> "--dry-run" arg, and seems to be blowing up because it can't merge
> properties on a file that was created on the branch:
>
> svn: Can't find an entry
> svn: Can't merge props into 'docs/samplecode.html':it's not under
> revision control.
>
> Am I doing something wrong, or is this a svn bug??

Maybe a bit of both? Someone else will have to say :)

-- 
Michael Wood <mwood@its.uct.ac.za>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jan 6 08:40:02 2003

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