From: Lennart Borgman <lennart.borgman@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: lekktu@gmail.com, emacs-devel@gnu.org
Subject: Re: Why did every line in w32fns.c get a ^M?
Date: Thu, 1 Jul 2010 19:03:42 +0200 [thread overview]
Message-ID: <AANLkTilwATeN4c3KbFFQJeTfZ3f3eq-RmA_hT5_QQpTi@mail.gmail.com> (raw)
In-Reply-To: <83sk439lt2.fsf@gnu.org>
On Thu, Jul 1, 2010 at 7:03 PM, Eli Zaretskii <eliz@gnu.org> wrote:
>> From: Lennart Borgman <lennart.borgman@gmail.com>
>> Date: Thu, 1 Jul 2010 14:56:31 +0200
>> Cc: Emacs-Devel devel <emacs-devel@gnu.org>
>>
>> On Thu, Jul 1, 2010 at 1:46 PM, Juanma Barranquero <lekktu@gmail.com> wrote:
>> >
>> >> and it looks like bzr merge could not handle that at all.
>> >
>> > How could it? If the local copy suddenly has CRLF in every line, *all*
>> > lines have changed and it has no anchors to detect where to apply
>> > incoming changes.
>>
>> You mean bzr can't be smart enough to recognize different line
>> endings? Of course not if it considers everything as binary, but that
>> is not necessary.
>
> I actually think the default Bazaar operation regarding EOLs is very
> nice. Even in your case, it did help you identify the problem right
> away, didn't it?
I think it is rather stupid actually.
It could have warned me of the situation instead.
> But if you don't like the default and want to get yourself into more
> trouble, read the section "End of Line Conversion" in the Bazaar User
> Reference manual (in the "Concepts" chapter).
Thanks.
next prev parent reply other threads:[~2010-07-01 17:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-01 10:37 Why did every line in w32fns.c get a ^M? Lennart Borgman
2010-07-01 10:42 ` Juanma Barranquero
2010-07-01 10:56 ` Lennart Borgman
2010-07-01 11:00 ` Juanma Barranquero
2010-07-01 11:36 ` Lennart Borgman
2010-07-01 11:46 ` Juanma Barranquero
2010-07-01 12:56 ` Lennart Borgman
2010-07-01 17:03 ` Eli Zaretskii
2010-07-01 17:03 ` Lennart Borgman [this message]
2010-07-01 17:08 ` Juanma Barranquero
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTilwATeN4c3KbFFQJeTfZ3f3eq-RmA_hT5_QQpTi@mail.gmail.com \
--to=lennart.borgman@gmail.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=lekktu@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).