[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: SteveKing <steveking_at_gmx.ch>
Date: 2004-12-17 09:24:26 CET

Will Dean wrote:

> 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.

Very strange. The stdafx.h file really has the conflict markers in it.
But did you notice that the '=====' marker isn't on its own line?
I guess that Subversion somehow wasn't sure if it should merge these
changes so it created a conflict. But then the diff library saw that the
merge could be done without a conflict and just merged them.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Dec 17 09:26:05 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.