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

Re: Merge problem

From: Christopher Ness <chris_at_nesser.org>
Date: 2005-09-15 18:42:49 CEST

On Thu, 2005-09-15 at 17:27 +0200, Ryan Schmidt wrote:
> On Sep 15, 2005, at 14:43, Christopher Ness wrote:
> > If you add a new file to a branch you have to copy the new file
> > over to the trunk. The merge will not copy it over for you if I
> > recall correctly.
>
> Um.... sure it will. "svn merge $A $B $C" will take the changes that
> occurred between $A and $B and apply them to $C. These could be
> modifications to existing files, deletions of files, additions of
> files, property changes—doesn't matter.

Opps. Of course you are correct Ryan.
I don't know why I thought this, my mistake.

Here is a working copy merge that compares the trunk with the branch and
applies the diff to trunk.

svn merge ./trunk/@HEAD ./branches/bugfix1/@HEAD ./trunk

Cheers,
Chris

-- 
PGP Public Key: http://www.nesser.org/pgp-key/
12:39:57 up 4:34, 2 users, load average: 0.05, 0.10, 0.08

Received on Thu Sep 15 18:45:08 2005

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