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

Re: Proposal: --no-props switch for 'log', 'st' and 'diff'

From: Gunnar Dalsnes <hardon_at_online.no>
Date: Mon, 08 Sep 2008 00:05:40 +0200


Stefan Sperling wrote:
On Sun, Sep 07, 2008 at 03:19:05PM +0200, Vincent Lefevre wrote:
  
On 2008-09-04 11:53:29 +0200, Stefan Sperling wrote:
    
On Thu, Sep 04, 2008 at 01:42:30AM +0200, Gunnar Dalsnes wrote:
      
Some of my colleges consequently revert\don't commit those
changes, they didn't change those files\folders so I fully
understand.
        
That's wrong. Your colleagues should _not_ omit mergeinfo property
changes from commits! If they omit these properties from commits,
they are not using Subversion as intended.
      
No, if Subversion modified svn:mergeinfo on *unrelated* files, his
colleagues ignore these files because Subversion didn't behave as
intended.
    

I agree that if totally unrelated files get their mergeinfo
modified, it's probably a bug.

IIRC there was no mention of that before in this thread, though.
  

Totally unrelated files\folders are not strictly modified but got their svn:mergeinfo deleted (but deletion is a modification too:-)). Nevertheless, very annoying and to me meaningless thingamabobs. Here is an example of a merge of one revision:

/branches/2.3                                                                                                                                Added: svn:mergeinfo "Merged /trunk:r1033"
/branches/2.3/src/Build/settings.bat                                                                                                 (changed & merged)
/branches/2.3/src/Plugins/Registration/ALPFeedstore/RegisterSilo/Model/FeedstoreDataTable.cs   Deleted: svn:mergeinfo
/branches/2.3/src/Plugins/Registration/ALPFeedstore/Resources/forlager_16x16.gif                        Deleted: svn:mergeinfo
/branches/2.3/src/Plugins/Registration/ALPFeedstore/Resources/forlager_20x20.gif                        Deleted: svn:mergeinfo
/branches/2.3/src/Plugins/Registration/ALPFeedstore/Resources/forsilo_16x16.gif                            Deleted: svn:mergeinfo
/branches/2.3/src/Plugins/Registration/ALPFeedstore/Resources/forsilo_20x20.gif                            Deleted: svn:mergeinfo
/branches/2.3/src/Plugins/Registration/BLDataMappers/Feed                                                            Deleted: svn:mergeinfo
/branches/2.3/src/Plugins/Registration/BLPMyActivities/DMHatching.cs                                            Deleted: svn:mergeinfo
/branches/2.3/src/VPA Framework/AFSBLServer/AFSBLServer.cs                                                 (changed & merged)
/branches/2.3/src/VPA Framework/AFSClient/View/frmLogin.cs                                                         (changed & merged)
/branches/2.3/src/VPA Framework/AFSClient/View/frmMain.cs                                                         (changed & merged)
/branches/2.3/src/VPA Framework/VPADALClasses/Feed/DAFeedDeliveryNotes.cs                        Deleted: svn:mergeinfo
/branches/2.3/src/VPA Framework/VPADALClasses/System/DASnapshotIsolation.cs                     (changed & merged)
/branches/2.3/src/VPA Framework/VPAEntities/Settings/VPASettings.cs                                         (changed & merged)
/branches/2.3/src/VPA Framework/VPAEntities/VPATransaction.cs                                                   Deleted: svn:mergeinfo

Damn uUgly.

"Its not a bug, its a feature"

Gunnar. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org For additional commands, e-mail: dev-help@subversion.tigris.org Received on 2008-09-08 00:05:55 CEST

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