[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: Paul Burba <ptburba_at_gmail.com>
Date: Tue, 19 Mar 2013 11:50:09 -0400

On Tue, Mar 19, 2013 at 10:56 AM, Philip Martin
<philip.martin_at_wandisco.com> wrote:
> 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.

So you'd like to see some alternative notification for merges that are
ultimately inoperative?

Do you agree that we'd need a variant for inoperative forward merges too, e.g.:

>svn pl -vR
  Properties on 'branch':
    svn:mergeinfo
      /A:2-6

>svn merge ^^/A branch -r1:6
  --- Recording mergeinfo for merge of r2 through r6 into 'branch':
   U branch

>svn st

>

And what about inoperative merges that adjust mergeinfo (think
periodic automatic sync merges that are occasionally inoperative, but
still tweak mergeinfo):

>svn merge ^^/A branch
  --- Recording mergeinfo for merge of r7 into 'branch':
   U branch

>svn diff
  Index: branch
  ===================================================================
  --- branch (revision 7)
  +++ branch (working copy)

  Property changes on: branch
  ___________________________________________________________________
  Modified: svn:mergeinfo
     Merged /A:r7

-- 
Paul T. Burba
CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development
Skype: ptburba
Received on 2013-03-19 16:50:42 CET

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