[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: Paul Burba <ptburba_at_gmail.com>
Date: Fri, 7 Mar 2008 09:22:38 -0500

On Fri, Mar 7, 2008 at 1:19 AM, Karl Fogel <kfogel_at_red-bean.com> wrote:
> 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.

A theory on what might have happened:

1) These files all had explicit svn:mergeinfo in trunk and 1.5.x:

  www/images/subversion-diagram.png
  www/images/subversion_logo-200x173.png
  www/images/subversion_logo_hor-468x64.png
  www/images/subversion_logo-384x332.png
  notes/reintegrate-todo.txt
  notes/tree-conflicts/scratch-pad.txt

2) Mike upgrades the server to 1.5.0 alpha 2

3) Hyrum checks out a new 1.5.x WC, which includes explicit mergeinfo
on the six files.

4) Mike filters out all existing mergeinfo from the repository and
converts svnmerge-integrated props to svn:mergeinfo. The six files in
1) no longer have mergeinfo.

6) In r29759 Hyrum merges some changes from trunk to his 1.5.x WC,
which still has explicit mergeinfo on the 'six'. This mergeinfo
doesn't exist in the repository so when he commits the backport we see
mergeinfo added to the six files:

C:\SVN\src-branch>svn info
Path: .
URL: http://svn.collab.net/repos/svn/branches/1.5.x
Repository Root: http://svn.collab.net/repos/svn
Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Revision: 29766
Node Kind: directory
Schedule: normal
Last Changed Author: kfogel
Last Changed Rev: 29766
Last Changed Date: 2008-03-07 01:30:08 -0500 (Fri, 07 Mar 2008)

C:\SVN\src-branch>svn diff -r29758:29759 www

Property changes on: www\images\subversion-diagram.png
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/www/images/subversion-diagram.png:r29567-29568,29578,29678

Property changes on: www\images\subversion_logo-200x173.png
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/www/images/subversion_logo-200x173.png:r29567-29568,29578,29678

Property changes on: www\images\subversion_logo_hor-468x64.png
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/www/images/subversion_logo_hor-468x64.png:r29567-29568,29578,29678

Property changes on: www\images\subversion_logo-384x332.png
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/www/images/subversion_logo-384x332.png:r29567-29568,29578,29678

C:\SVN\src-branch>svn diff -r29758:29759 notes

Property changes on: notes\reintegrate-todo.txt
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/sqlite-mergeinfo-without-mergeinfo/reintegrate-branch-TODO:r28127-28195
   Merged /branches/whole-branch-merge/reintegrate-branch-TODO:r28245-28427
   Merged /branches/reintegrate/reintegrate-branch-TODO:r28428-28977
   Merged /trunk/notes/reintegrate-todo.txt:r29567-29568,29578,29678
   Merged /branches/sqlite-deep-copies/reintegrate-branch-TODO:r28196-28244
   Merged /branches/sqlite-node-origins/reintegrate-branch-TODO:r27841-27889
   Merged /branches/mergeinfoless-copies/reintegrate-branch-TODO:r27771-28001

Property changes on: notes\tree-conflicts\scratch-pad.txt
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/notes/tree-conflicts/scratch-pad.txt:r29567-29568,29578,29678

7) Now Karl updates his 1.5.x WC or checks out a new one, either way
he gets the subtree mergeinfo from 6, so diff/stat aren't going to
show anything unusual.

Paul

> 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")?

Not sure what svn st

> -Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-07 15:22:55 CET

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