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

Re: Merging and gratuitous display of explicit mergeinfo.

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Fri, 07 Mar 2008 09:06:40 -0500

Karl Fogel wrote:
> Karl Fogel <kfogel_at_red-bean.com> writes:
>> At http://pastebin.ca/931468, you can see some merge behavior that
>> surprised me. I merged one revision from trunk to branch, affecting
>> two files. But afterwards, my formerly pristine branch working copy
>> showed *10* files changed: two of them were the ones I expected, and
>> the others had property changes to -- you guessed it -- svn:mergeinfo.
>>
>> Am I merely revisiting an old discussion here? Has this been hashed
>> out already? Was it already proposed that 'svn status' and 'svn diff'
>> not show changes to svn:mergeinfo by default (and take a -g flag to
>> mean "do count svn:mergeinfo property changes")?
>
> epg expressed interest in seeing the diff output too, so here it is:
>
> http://pastebin.ca/931473

This appears to be repeatable.

    $ cd projects/subversion-1.5.x
    $ svn up -q -r 29765 ## rev just prior to karl's commit
    $ svn merge -c 29188 http://svn.collab.net/repos/svn/trunk .
    --- Merging r29188 into '.':
    U subversion/libsvn_wc/adm_ops.c
    Conflict discovered in 'subversion/svn/conflict-callbacks.c'.
    Select: (p) postpone, (df) diff-full, (e) edit,
            (h) help for more options: e
    Waiting for Emacs...Done
    Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
            (h) help for more options: r
    U subversion/svn/conflict-callbacks.c
    $ svn st
     M .
     M www/images/subversion-diagram.png
     M www/images/subversion_logo-200x173.png
     M www/images/subversion_logo_hor-468x64.png
     M www/images/subversion_logo-384x332.png
     M notes/reintegrate-todo.txt
     M notes/tree-conflicts/scratch-pad.txt
    M subversion/libsvn_wc/adm_ops.c
    M subversion/svn/conflict-callbacks.c
     M CHANGES
    $

But on closer inspection, it's not quite the same:

    $ svn diff -N

    Property changes on: .
    ___________________________________________________________________
    Modified: svn:mergeinfo
       Merged /trunk:r29188

    Property changes on: CHANGES
    ___________________________________________________________________
    Modified: svn:mergeinfo
       Merged /trunk/CHANGES:r29188
    $

Those mergeinfo props do at least actually refer to the revision I merged
instead of ... something else.

NOTE: I'm using a trunk build from sometime yesterday.

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on 2008-03-07 15:27:00 CET

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