[ros-dev] [ros-diffs] [tkreuzer] 46677: Remove svn:mergeinfo property from several files

Colin Finck mail at colinfinck.de
Fri Apr 2 19:30:49 CEST 2010


tkreuzer at svn.reactos.org wrote:
> Remove svn:mergeinfo property from several files

We should rather try to eliminate the root of these constant merge
artifacts, which seem to be the remaining svn:keywords properties.
As these ones instruct Subversion to update the revision number in the
affected files, they probably also include the revision numbers of merges
maintained by svn:mergeinfo.

I've already removed some svn:keywords properties in the same files (for
example in r41694), but I believe that this doesn't help much unless the
properties are also removed in all branches we use for merging.

Cheers,

Colin




More information about the Ros-dev mailing list