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

Re: duplicate merge conflict

From: Ryan Schmidt <subversion-2011a_at_ryandesign.com>
Date: Tue, 19 Apr 2011 17:39:51 -0500

On Apr 19, 2011, at 09:56, Daniel Walter wrote:

> svn merge appears to work with revision numbers but not symbolically with tags. Is this expected?

Tags are not symbols. Tags are directories. You can merge with directories if you want, provided you use their complete repository URL, or a valid path within your working copy (though it's unlikely you actually have your tags in your working copy).

> The merge happens twice if I use tags:
> svn merge tag1 tag2 --non-interactive
> But when I find the revisions with svn info
> svn info tag1
> Last Changed Rev: 457
> svn info tag2
> Last Changed Rev: 467
> and then do the merge based on these revision numbers
> svn merge -r 457:467 trunk --non-interactive
> the merge happens correctly
Received on 2011-04-20 00:40:27 CEST

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

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