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

Re: A question about merging and conflicts

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-04-26 17:09:49 CEST

Brian Denny <brian@briandenny.net> writes:

> > What was the problem here?
>
> if i understood Mike correctly, he wants to use a tag instead of a
> revnum to specify what to merge.

I'm not sure what the problem is, then.

If he copied /trunk to /tags/tag1 in revision 100, then the command

  svn [merge|diff] http://.../tags/tag1 http://.../trunk

should be exactly the same as

  svn [merge|diff] -r100:HEAD http://.../trunk

Beacuse /trunk@100 == /tags/tag1@100. They're the same tree.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Apr 26 17:11:48 2003

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