From: a@9srv.net (Anthony Sorace)
Subject: [9fans] anybody figured out a way to use acme as graphical merging tool for hg?
Date: Thu, 17 Mar 2011 09:39:30 -0400 [thread overview]
Message-ID: <FC3BADD6-C191-41D1-A52B-84B14703A538@9srv.net> (raw)
In-Reply-To: <AANLkTimtCO=UwntxJ-hoTBGXpeUrsEo8p_=b_LjKV0t8@mail.gmail.com>
On Mar 16, 2011, at 17:30, Iruat? Souza wrote:
> adiff may be a good place to look at too.
A while ago I also wrote cdiff, which you put in the tag line of an
adiff window and it'll plumb successive change pairs, bringing up
the relevant sections in each file. It is not well tested, but there's
not much to it (thank you, acme).
/n/sources/contrib/anothy/bin/rc/cdiff
The trickiest part was realizing you have to hold the addr file open
to get the changes you expect from writes to ctl; I'd expected that
to be the other way around.
I don't use it for VCS merges, but it seems like it might be a good
starting point for that.
Anthony
-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 194 bytes
Desc: This is a digitally signed message part
URL: <http://mail.9fans.net/private/9fans/attachments/20110317/b233e023/attachment.pgp>
next prev parent reply other threads:[~2011-03-17 13:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-16 6:14 Fernan Bolando
2011-03-16 14:27 ` Mathieu Lonjaret
2011-03-16 21:30 ` Iruatã Souza
2011-03-17 13:39 ` Anthony Sorace [this message]
2011-03-16 15:02 ` dexen deVries
2011-03-16 21:03 ` Steve Simon
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=FC3BADD6-C191-41D1-A52B-84B14703A538@9srv.net \
--to=a@9srv.net \
/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.
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 NNTP newsgroup(s).