From: Kevin Ryde <user42@zip.com.au>
To: Ian Dalton <iain.dalton@gmail.com>
Cc: Karl Fogel <kfogel@red-bean.com>,
13882@debbugs.gnu.org, Dmitry Gutov <dgutov@yandex.ru>
Subject: bug#13882: 24.2; saveplace.el limit drop least recently used
Date: Tue, 12 Mar 2013 11:43:47 +1100 [thread overview]
Message-ID: <87txoh8n24.fsf@blah.blah> (raw)
In-Reply-To: <CAE4hOxKc3xCg8jWm6ddP6Sp4Qy1LQtt7mVj2=P8oWzW669uJPQ@mail.gmail.com> (Ian Dalton's message of "Mon, 11 Mar 2013 16:08:42 -0600")
Ian Dalton <iain.dalton@gmail.com> writes:
>
> I no longer use this setup, so I don't know how useful a change it was. I
> think that the Unison UI had some kind of option to do guided file merges,
> but it only worked for the usual simple line-oriented diff.
Hmm. Making the file line-wise probably helped, but I imagine there's
no file format which could give the perfect result from the usual
diff/patch contextual merges.
How about keeping the line-by-line pretty print for everyone's
readability, but drop the sort since it's actively harmful, and leave
anything more for future thought.
next prev parent reply other threads:[~2013-03-12 0:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-05 20:49 bug#13882: 24.2; saveplace.el limit drop least recently used Kevin Ryde
2013-03-07 15:32 ` Dmitry Gutov
2013-03-07 21:20 ` Karl Fogel
2013-03-07 22:13 ` Dmitry Gutov
2013-03-10 0:57 ` Kevin Ryde
2013-03-10 22:09 ` Karl Fogel
2013-03-11 21:23 ` Kevin Ryde
2013-03-11 22:00 ` Karl Fogel
2013-03-11 22:08 ` Ian Dalton
2013-03-12 0:43 ` Kevin Ryde [this message]
2013-03-13 18:59 ` Karl Fogel
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=87txoh8n24.fsf@blah.blah \
--to=user42@zip.com.au \
--cc=13882@debbugs.gnu.org \
--cc=dgutov@yandex.ru \
--cc=iain.dalton@gmail.com \
--cc=kfogel@red-bean.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).