Re: Bug: TortoiseUDiff creates way too large diff when only adding lines

2018-02-12 Thread tortoisesvn+APn2wQeymmA6gbzZ5o6zywn-5IoAT0UrJbruz7EVKrCBU5EOPvPj
Am Samstag, 10. Februar 2018 09:58:19 UTC+1 schrieb Stefan:
> 
> 
> 
> So you're creating the patch file from TMerge. There's no option to ignore 
> EOLs for that yet.
> I've now added that option as a checkbox in the file-save dialog (r28102).
> 
> you can try a nightly build tomorrow if you like:
> https://nightlybuilds.tortoisesvn.net/latest/ 
> 
> Stefan

Stefan, I confim that the lasted implementation fixes this issue.
Thanks, this discussion can be closed.
Viele GrĂ¼sse, Matthias

-- 
You received this message because you are subscribed to the Google Groups 
"TortoiseSVN" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to tortoisesvn+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/tortoisesvn/dce50385-798b-4464-9b5e-ad2af692eaf5%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: Bug: TortoiseUDiff creates way too large diff when only adding lines

2018-02-10 Thread Stefan via TortoiseSVN


On Thursday, February 8, 2018 at 2:41:34 PM UTC+1, (unknown) wrote:
>
>
> > If you hold down the shift key when you click on the "create unified 
> diff" menu entry (or whatever command you used in TSVN), then a dialog will 
> first show up where you can specify whether you want to ignore EOL changes 
> in the diff. 
>
> Hmm... In TortoiseMerge, I only have a "create patch file" button. I 
> remember that there was a "create unified diff" button, but that has 
> disappeared in a recent version. 
>

So you're creating the patch file from TMerge. There's no option to ignore 
EOLs for that yet.
I've now added that option as a checkbox in the file-save dialog (r28102).

you can try a nightly build tomorrow if you like:
https://nightlybuilds.tortoisesvn.net/latest/ 

Stefan

-- 
You received this message because you are subscribed to the Google Groups 
"TortoiseSVN" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to tortoisesvn+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/tortoisesvn/53d0c2cd-0cda-4da0-8a7e-41581277f34d%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


Re: Bug: TortoiseUDiff creates way too large diff when only adding lines

2018-01-25 Thread Stefan via TortoiseSVN


>
> Well, I cannot see a "Attach a file" field, probably since I am not member 
> of this list. 
>
> But I have found the root cause of the issue: The lines of the original 
> files are  terminated, whereas I added  terminated line. Seems 
> like UDiff cannot cope with mixed line endings. (Of course a file shouldn't 
> do this, but apparently this may happen.)


If you hold down the shift key when you click on the "create unified diff" 
menu entry (or whatever command you used in TSVN), then a dialog will first 
show up where you can specify whether you want to ignore EOL changes in the 
diff. 

-- 
You received this message because you are subscribed to the Google Groups 
"TortoiseSVN" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to tortoisesvn+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/tortoisesvn/03bce271-0593-47a6-92fd-7709c3f18b0b%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.