[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: George Wieggers <george.wieggers_at_gmail.com>
Date: 2005-01-06 22:40:07 CET

> Thanks for the patch. A few comments though:
> - can you provide a use case where TMerge handles non-existing files? I
> don't know exactly when/why that should ever happen (maybe it's a bug in
> TortoiseMerge?). Or are you talking about applying a patch where there's
> a file newly added in the patch?

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.

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

> - you're using a fixed string for the hint text. That's not so good
> since TSVN get's translated into a lot of languages. So we always put
> such strings into the resources. (I can do that myself, if you just
> explain when/where/why TMerge works with non-existing files).

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

I leave it up to you to decide whether or not to commit this patch

- George

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:40:53 2005

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