AW: Empty result file after merge

Thanks for reply.

The attachment shows the TMerge Window.
And yes - I did not save, because there were no changes made by my own. If I push save before closing the window, merge is doing well.

Best regards
Frank

-----Ursprüngliche Nachricht-----
Von: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
Gesendet: Montag, 27. August 2012 20:19
An: users_at_tortoisesvn.tigris.org
Betreff: Re: Empty result file after merge

On 27.08.2012 13:52, Frank Streubel wrote:
> Hello,
>
> I noticed that carriage return (CR) and line feed (LF) in different
> combinations in merge source and merge destination causes problems.
>
> Reproducer:
>
> *trunk
>
> |- test.txt
>
> contains an empty line with CR and LF at the end
>
> *branch from trunk
>
> test.txt
>
> contains an empty line with LF at the end.
>
> 1. edit "branch => test.txt" and write bla before LF
>
> 2. Commit
>
> 3. Try Merge from branch into trunk
>
> 4. Resolve Conflict Dialog appears
>
> 5. Edit Conflict => TortoiseMerge doesn't show any conflict

What does TMerge show in the bottom pane?

>
> 6. Close TortoiseMerge

Did you save first? If not, then you didn't resolve the conflict.

> 7. click Resolved in Resolve Conflict Dialog
>
> 8. Ok
>
> => local "trunk => test.txt" is modified now AND is completely EMPTY
> (no CR, no LF)

if you forgot to save after 5), then yes, that can happen.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3001386
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3001494
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].