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

RE: [TSVN] TortoiseMerge - Line Break Issue

From: Brendan van Drempt <Brendan_vanDrempt_at_scholastic.com.au>
Date: 2005-02-16 01:18:14 CET

That worked like a charm... One of our developers on a Mac had the wrong
line end type (CR instead of CR LF)

Thanks!

Regards,

Brendan.

On Tue, 15 Feb 2005 10:34:36 +1100, Brendan van Drempt
<Brendan_vanDrempt@scholastic.com.au> wrote:
> I'm wondering if anyone can shed some light on an issue I have using
> TortoiseMerge
>
> When I attempt to resolve a conflict or do a diff... All the code is
> appearing on one line... which is very frustrating as you can not
> choose actual lines of code from "yours" or "theirs" and renders the
> application useless.

Check your file(s) with a hex editor. You'll find that you're using the MAC
lineending style (one CR) which isn't supported (even newer Mac's don't use
that lineending style anymore!).

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
#######################################################################
Attention: 
This communication may contain CONFIDENTIAL or copyright information 
of Scholastic Australia. If you are not an intended recipient, you MUST
NOT keep, forward, copy, use, save or rely on this communication, and 
any such action is unauthorised and prohibited. If you have received
this communication in error, please reply to this email to notify the
sender of its incorrect delivery, and then delete both it and your
reply.
Thank You
This e-mail message has been scanned for Viruses and Content and 
cleared by NetIQ MailMarshal 
#######################################################################
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Feb 16 01:15:59 2005

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