Re: SVN merge "touching" files.

luccux_at_yahoo.com wrote:
> I recently migrated my SVN server using svnadmin dump from Berkley to
> fsfs. I had all clients upgrade to 1.5.
>
> The strange behavior that we are seeing is that during a merge to
> trunk, if we select a range of revisions, it will merge those
> revisions but also "touch" many other random files that don't have
> anything to do with the revision. These files show up when you
> attempt to commit but the file have no differences. this happens on
> the command line and in the gui. Any ideas? Is this related to the
> new mergeinfo stuff?

All those files have the property svn:mergeinfo either set or modified.
Subversion 1.6 will have that 'touching' reduced a lot, but for now
you'll have to live with it.
You can either commit those changes, or revert all files which weren't
really part of the merge to get rid of the modified/added svn:mergeinfo
property.

Note: if you remove/revert the property changes, subsequent merges won't
be faster (they would be a little bit faster with the property still
intact).

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=979046
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].