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

Re: Issue 3247 "merge doesn't honour specified source"

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Tue, 19 Mar 2013 14:56:58 +0000

Paul Burba <ptburba_at_gmail.com> writes:

> Where we can improve is in skipping the '[Recording | Eliding]
> mergeinfo' notifications if nothing was actually merged.

Essentially we are skipping a reverse merge because we cannot record
it. That's fine by me so long as we make it clear to the user. This is
clear:

$ svn co file://`pwd`/repo/A2_at_2 wc
$ svn merge -c-3 ^/A2 wc
svn: E195020: Cannot reverse-merge a range from a path's own future history; try updating first

but I believe simply skipping the notifications to give:

$ svn co file://`pwd`/repo/A wc
$ svn merge -c-3 ^/A2 wc
$

would still be confusing.

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Received on 2013-03-19 15:57:47 CET

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