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

Re: Re: Merge issues.

From: Johan Appelgren <johan.appelgren_at_gmail.com>
Date: 2005-01-26 23:43:13 CET

On Wed, 26 Jan 2005 13:48:19 -0800, Carter Thompson
<cthompso@outerbay.com> wrote:
>
> Alright, seems like changing the directory such that "src" is
> sub-directory
> works, but I guess the confusion comes when I explicitly provided paths
> to
> the source and destination files (UIResources.properties). Shouldn't I
> be able to provide two revisions and absolute paths to merge? That is:
>
> svn merge -rN:M http://absolute/path/to/file/on/branch \
> http://absolute/path/to/file/on/trunk
>
> What if I only wanted to merge *one* file from revision 26 and not the
> entire tree?

If you want to merge the changes made to a file in a branch to trunk
you can for example do the following:

svn merge -rN:M http://path/to/file/on/branch path/to/file/in/wc/of/trunk

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 26 23:45:59 2005

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