* [9fans] anybody figured out a way to use acme as graphical merging tool for hg? @ 2011-03-16 6:14 Fernan Bolando 2011-03-16 14:27 ` Mathieu Lonjaret 2011-03-16 15:02 ` dexen deVries 0 siblings, 2 replies; 6+ messages in thread From: Fernan Bolando @ 2011-03-16 6:14 UTC (permalink / raw) Hi all As I believe there a few hg users here. I was wondering if anybody has a way to use acme to resolve merge conflicts by showing the diffs in different panes. fernan ^ permalink raw reply [flat|nested] 6+ messages in thread
* [9fans] anybody figured out a way to use acme as graphical merging tool for hg? 2011-03-16 6:14 [9fans] anybody figured out a way to use acme as graphical merging tool for hg? Fernan Bolando @ 2011-03-16 14:27 ` Mathieu Lonjaret 2011-03-16 21:30 ` Iruatã Souza 2011-03-16 15:02 ` dexen deVries 1 sibling, 1 reply; 6+ messages in thread From: Mathieu Lonjaret @ 2011-03-16 14:27 UTC (permalink / raw) Hello, Maybe that would help, as a starting point? http://9fans.net/archive/2009/06/138 mathieu -------------- next part -------------- An embedded message was scrubbed... From: Fernan Bolando <fernanbolando at mailc.net> Subject: [9fans] anybody figured out a way to use acme as graphical merging tool for hg? Date: Wed, 16 Mar 2011 14:14:15 +0800 Size: 4658 URL: <http://mail.9fans.net/private/9fans/attachments/20110316/36c1481f/attachment.mht> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [9fans] anybody figured out a way to use acme as graphical merging tool for hg? 2011-03-16 14:27 ` Mathieu Lonjaret @ 2011-03-16 21:30 ` Iruatã Souza 2011-03-17 13:39 ` Anthony Sorace 0 siblings, 1 reply; 6+ messages in thread From: Iruatã Souza @ 2011-03-16 21:30 UTC (permalink / raw) adiff may be a good place to look at too. On Wed, Mar 16, 2011 at 11:27 AM, Mathieu Lonjaret <mathieu.lonjaret at gmail.com> wrote: > Hello, > > Maybe that would help, as a starting point? > > http://9fans.net/archive/2009/06/138 > > mathieu > > > ---------- Forwarded message ---------- > From:?Fernan Bolando <fernanbolando at mailc.net> > To:?Fans of the OS Plan 9 from Bell Labs <9fans at 9fans.net> > Date:?Wed, 16 Mar 2011 14:14:15 +0800 > Subject:?[9fans] anybody figured out a way to use acme as graphical merging tool for hg? > Hi all > > As I believe there a few hg users here. I was wondering if anybody has > a way to use acme to resolve merge conflicts by showing the diffs in > different panes. > > fernan > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [9fans] anybody figured out a way to use acme as graphical merging tool for hg? 2011-03-16 21:30 ` Iruatã Souza @ 2011-03-17 13:39 ` Anthony Sorace 0 siblings, 0 replies; 6+ messages in thread From: Anthony Sorace @ 2011-03-17 13:39 UTC (permalink / raw) 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> ^ permalink raw reply [flat|nested] 6+ messages in thread
* [9fans] anybody figured out a way to use acme as graphical merging tool for hg? 2011-03-16 6:14 [9fans] anybody figured out a way to use acme as graphical merging tool for hg? Fernan Bolando 2011-03-16 14:27 ` Mathieu Lonjaret @ 2011-03-16 15:02 ` dexen deVries 2011-03-16 21:03 ` Steve Simon 1 sibling, 1 reply; 6+ messages in thread From: dexen deVries @ 2011-03-16 15:02 UTC (permalink / raw) Hi, On Wednesday 16 of March 2011 07:14:15 Fernan Bolando wrote: > As I believe there a few hg users here. I was wondering if anybody has > a way to use acme to resolve merge conflicts by showing the diffs in > different panes. Having only experience with KDiff3, it seems to me it's mostly matter of: * synchronizing scrolling of four windows: (Base, Mine, Theirs, Output). The former three should occupy one column each while the Result window ought to span all three columns. Horizontal layout is also possible. * having some decent keyboard shortcuts: Next, Prev, Next Unsolved, Prev Unsolved, Choose A, Choose B, Choose C * marking common/different sections (A&B vs. C, A & C vs. B, A vs. B vs. C) with colors or some textual markers. The screenshot [1] is cluttered cause of small screen size, but usually it looks much better. I dunno if that's easy achievable in Acme. Perhaps a new program running directly in two (3 columns + 1 column) or four Rio windows would be better. [1] http://kdiff3.sourceforge.net/doc/screenshot_merge.png -- dexen deVries [[[?][?]]] ``In other news, STFU and hack.'' mahmud, in response to Erann Gat's ``How I lost my faith in Lisp'' http://news.ycombinator.com/item?id=2308816 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [9fans] anybody figured out a way to use acme as graphical merging tool for hg? 2011-03-16 15:02 ` dexen deVries @ 2011-03-16 21:03 ` Steve Simon 0 siblings, 0 replies; 6+ messages in thread From: Steve Simon @ 2011-03-16 21:03 UTC (permalink / raw) I have always wanted a dedicated merge tool on plan9 and have even resorted to windows over vnc to sort out difficult merges (blush). -Steve ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-17 13:39 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2011-03-16 6:14 [9fans] anybody figured out a way to use acme as graphical merging tool for hg? Fernan Bolando 2011-03-16 14:27 ` Mathieu Lonjaret 2011-03-16 21:30 ` Iruatã Souza 2011-03-17 13:39 ` Anthony Sorace 2011-03-16 15:02 ` dexen deVries 2011-03-16 21:03 ` Steve Simon
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).
