Mixed encodings in source files make patch unusable

Hello.

I've just noticed that I can't apply a patch made on files with
different encodings.
I have a project with several C++ sources (.cpp). One of them saved in
unicode (namely - once somebody wrote a comment with pair of symbols
in hebrew - and MS Visual Studio automatically saved the file after it
in unicode - UTF-16LE witn uncode signature (BOM)). Nothing happens
visually - all works as before.

Today I've changed two lines in this very unicoded file - and then -
made a patch with local changes.

The problem is that I cannot apply this patch!

I've made the test repository and reproduced all the things.

1. Create at ext file. Let it contains simple line "This is a
text.<cr><lf>". Save it as "ascii_text.txt"
2. Open the file and save it as as "unicode_text.txt" with UTF-16LE
encoding and BOM.
3. Commit the folder and add these files to repository.
4. TSVN automatically assing to unicode one the property MIME that it
is "octet-stream" - so, just clear this property and commit again.

Now - the very issue:

5. Change both files - open them one-by one and add a space before
every line (just to make them changed).
6. Commit the changes.

Making a patch:

7. Update to previous revision (without change)
8. Merge the working copy with the last revision
9. Make a patch from working copy - include (IMPORTANT!) both files
into a patch.

And - finally - illustration:

10. Revert changes.
11. Apply the patch.

I can't do it - it says about a wrong line - just the line where in
the patch the unicode section starts.

So, the summary:

a) MSVS can easy and transparent convert your src file into unicode -
and even doesn't mention it to you.
b) you can easy create a patch which includes changes both from ascii
and unicode sources simultaneously.
c) you CANNOT apply this patch!

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-06-17 12:31:32 CEST