[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: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-09-15 17:27:49 CEST

On Sep 15, 2005, at 14:43, Christopher Ness wrote:

> On Thu, 2005-09-15 at 09:39 +0200, Anthony Muller wrote:
>
>> I'm working in a branch. I add a new file in this branch. I commit
>> the file in the repository.
>
> 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.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 15 17:30:05 2005

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.