httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Graham Leggett <minf...@sharp.fm>
Subject Stray svn:mergeinfo on files
Date Wed, 30 Nov 2011 00:02:59 GMT
Hi all,

While merging I am getting a lot of stray svn:mergeinfo changes on arbitrary files, for example:

 M      modules/core/mod_watchdog.c
 M      modules/core/mod_so.c
 M      modules/core/Makefile.in
 M      modules/core/config.m4
 M      modules/core/mod_watchdog.dsp
 M      modules/core/mod_watchdog.h
 M      modules/core/mod_so.h

According to various googling[1][2], the solution is to remove the svn:mergeinfo property
from all files except for the root. Can anyone confirm whether this makes sense?

[1] http://stackoverflow.com/questions/1496884/subversion-marks-unmodified-files-as-modified
[2] http://stackoverflow.com/questions/767418/remove-unnecessary-svnmergeinfo-properties

Regards,
Graham
--


Mime
View raw message