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

Re: [TSVN] should TortoiseMerge report an error if file not found?

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-01-06 22:47:38 CET

George Wieggers wrote:

> When I tried to diff a newly added file (without text-base file), I
> got the impression that an empty text-base file was present, because
> TortoiseSVN didn't report an error.

Ah ok.
I guess I'm getting old: this was exactly what we've been discussing
about today here on the list - I should have know...

> And, besides that. TortoiseMerge doesn't validate the filenames
> supplied as command arguments, when using /base:, /theirs: and /yours:
> in function CFileTextLines::Load
> //file does not exist, so just return SUCCESS

I wouldn't say 'doesn't validate filenames'. TortoiseMerge _has_ to
return SUCCESS here. If it wouldn't, then a patchfile which contains a
new added file wouldn't work, you couldn't apply that patch!

> I'm sorry. I'm only beginning to understand how the source code is
> organized. I guessed a _T( ) call would be sufficient. Apparently I'm
> wrong.
> I leave it up to you to decide whether or not to commit this patch

No problem. I'll commit it (with the string moved to the resources)
tomorrow evening.


   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 Thu Jan 6 22:49:24 2005

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