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

Bogus conlicts with Test merge

From: Wolf Peuker <peu_at_rekoba.de>
Date: Thu, 12 Nov 2009 15:50:57 +0100

Hi folks,

today I wanted to merge a whole developer branch into the trunk. Some
revisions from this branch I decided to skip as a result of analysis of
possible conflicts. That's why I had a list of revision ranges.
Nevertheless, when I started the /Test merge/, I got a list of crazy
conflicts. I was shocked but curious if I could resolve them, and I
decided to /Merge/. Now the surprise happened: no conflicts at all!

Although I'm very happy now, is this behavior well-known, is it tsvn or
svn stuff, and shouln't it be mentioned in the TortoiseSVN help?

Have a nice day,
best regards


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-11-12 15:51:16 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.