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

[TSVN] RE: problem with tortoiseMerge after svn merge tag1 tag2

From: Lorenz Lenhardt <lenhardt_at_salvia-lifetec.de>
Date: 2004-08-17 12:18:22 CEST

SteveKing wrote:

> I have no idea why TortoiseMerge wouldn't show you a conflict
> in such a situation.

Am I right that TortoiseMerge does not use the merged file produced by "svn
merge"?
In that case it's possible that TortoiseMerge was able to resolve the
situation, that "svn merge" flaged as conflicting.

> Can you send those four files to the list or me directly so I
> can check what's wrong? Or are the files closed source?

closed source. But if you are still interested I try to produce an example.

Lorenz
Received on Tue Aug 17 13:39:46 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.