On 1/1/10, Per Inge Mathisen <per.xxx...@xxxxxx.com> wrote: > On Fri, Jan 1, 2010 at 5:14 PM, Dennis Schridde <xxxx...@xxxxxx.net> wrote: > > Am Freitag, 1. Januar 2010 17:01:58 schrieb xxxx...@users.sourceforge.net: > >> Revision: 8906 > >> Property Changed: > >> ---------------- > >> branches/2.3/ > >> branches/2.3/data/mods/multiplay/original/ > >> branches/2.3/src/frontend.c > > You are changing unrelated files randomly as it seems. > > > That is a "feature" of the merge operation in recent versions of > subversion. Which, combined with its ever more glacial speed, is why I > rarely ever use svn merge anymore. >
Yeah, it is a by-product of having ancestry. It can be turned off via the --ignore-ancestry switch. I will post a new mail about switching to a different VCS and hopefully we can come up with a better alternative. _______________________________________________ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
