[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: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-01-27 03:02:45 CET

> 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

When you perform a merge you are supplying 2 revision/URL's. The changes
that took place between those two items are then applied to your WC. The
WC is the is not specified on the command, but it is the implied 3rd value.
So the location you are in when you run the command is important. I
actually, believe you can supply the path to the WC on the command.

There are then 2 different syntaxes for supplying what you want to base the
changes on. In your case, the changes all took place on the branch. So
you supply the URL to the branch, and the range of revisions where the
changes took place.

merge -r100:200 url://host/repos/project/branch [WC-optional]

Let's say the branch was longer lived and you had been using merge to keep
it up to date with trunk. In that scenario, it is difficult to pick out
just the changes that happened on the branch. In that case, since all of
the changes from trunk have been merged to branch, you can supply the URL
for the branch and the URL for the trunk. The differences, will be the
changes you made on the branch. In this case, you supply 2 URL's and
optionally a revision as part of the URL.

merge url://host/repos/project/trunk_at_HEAD
url://host/repos/project/branch_at_HEAD [WC-optional]

> What if I only wanted to merge *one* file from revision 26 and not the
> entire tree?

I have never tried it, but I would assume you would supply the complete URL
to the file.

merge -r25:26 url://host/repos/project/branch/filename.ext [WC-optional]

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jan 27 03:07:03 2005

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