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

Re: [TSVN] Big Lint-cleaning patch

From: Will Dean <svn_at_indcomp.co.uk>
Date: 2004-12-16 20:53:12 CET

At 19:02 16/12/2004 +0100, you wrote:

>After applying the patch and fixing the BUGBUGs, I couldn't compile. So I
>had to tweak it a little bit to make it work.

There was certainly one problem with is compiling in debug mode - it all
compiled completely cleanly here in release mode.

>First test runs were ok, so I committed the whole thing in revision 2140.

As ever when we do this, I have hundreds of conflicts when I update, which
I'd expect.

However, one of them was on stdafx.h in TortoiseBlame. It appears that
this has somehow defeated TMerge - the file is conflicted and contains
conflict markers, but doesn't show any conflicts when I do a 'show
conflicts' from the shell on the stdafx.h file.

What's going on here? I have attached the four relevant files.



To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

Received on Thu Dec 16 20:54:13 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.