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

RE: Showing unmerged revisions within a range

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Fri, 7 Feb 2014 23:37:08 +0000

> I created a branch (4.0.x) from trunk. Work progressed on trunk and was
> selectively merged down to the 4.0.x branch.
>
> The intent was to do our next release off this branch and then kill it.
> Subsequent releases would come from the trunk (or branches thereof).
>
> Unfortunately plans changed, and we needed to clone the 4.0.x branch to
> produce a 4.0.2 branch. Subsequent changes were made on the trunk and
> merged individually to each branch.
>
> We've since released 4.0.2, and so I want to kill the 4.0.2 branch.
> Before doing that, I want to ensure that all changes which were merged from
> the trunk to the 4.0.2 branch also made it to the 4.0.x branch.
>
> I tried the following:
>
> % svn log --stop-on-copy ${Repository Root}/branches/4.0.2 [ ...snip... ]
> ------------------------------------------------------------------------
> r202859 | kyle | 2014-01-29 11:50:48 -0800 (Wed, 29 Jan 2014) | 2 lines
>
> % svn info
> Path: .
> URL: ${Repository Root}/branches/4.0.x
>
> % svn mergeinfo -r202859:HEAD --show-revs=eligible $Repository
> Root}/branches/4.0.2 .
> svn: E195008: Revision range is not allowed
>
>
> Why does mergeinfo say "revision range is not allowed" when "svn help
> mergeinfo" lists --revision under "Valid options"?

The help says:

(some commands also take ARG1:ARG2 range)

Did you not get what you wanted without specifying a range?

Hmm... I just tried it and didn't get that error:

svn mergeinfo -r6000:HEAD --show-revs eligible http://myserver/svn/manage/MyAppRootName/v7.5.4
r60148
r60155
r60156
r60157
r60158

I'm using 1.8.4.

BOb
Received on 2014-02-08 00:37:42 CET

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.