[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: Carter Thompson <cthompso_at_outerbay.com>
Date: 2005-01-26 22:48:19 CET

> -----Original Message-----
> From: Mark Phippard [mailto:MarkP@softlanding.com]
>
> You must not be in the right directory whem you run the
> command. You need
> to be in the WC directory, and "src" should be a sub-directory of the
> directory you are in when you run the command.

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?

Thanks for your help, Mark.

Carter.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 26 22:51:16 2005

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