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

Re: merge to individual file syntax

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2003-07-07 22:00:34 CEST

Garrett Rooney <rooneg@electricjellyfish.net> writes:

> So I think we should check to see if merge_b->target refers to an
> entry with the same url, and if so use that path, otherwise we'd
> have to find some other way to get a wcpath, or error out, because
> PREV doesn't make sense if we don't have a wcpath to associate with
> it.

No, don't use the target at all, use the source. PREV only makes sense
if the merge source is a wc_path, so

   svn merge -rHEAD:PREV http://.... some/path

is an error.

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 7 22:01:37 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.