From: David Aguilar <davvid@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Tanguy Ortolo <tanguy+debian@ortolo.eu>,
git@vger.kernel.org, Sebastian Schuberth <sschuberth@gmail.com>,
Charles Bailey <charles@hashpling.org>
Subject: Re: git-mergetool: wrap tools with 3 files only to use the BASE file instead of MERGED
Date: Thu, 11 Aug 2011 02:37:32 -0700 [thread overview]
Message-ID: <20110811093731.GB29507@gmail.com> (raw)
In-Reply-To: <20110811084955.GA31233@elie.gateway.2wire.net>
On Thu, Aug 11, 2011 at 03:49:55AM -0500, Jonathan Nieder wrote:
> David Aguilar wrote:
>
> > I think it sounds like a good thing for certain tools.
> > Sebastian mentioned it being fine in ecmerge and bc3.
> > xxdiff also lets you specify the output file, so it
> > probably wouldn't need it either, I think.
>
> At the risk of taking away the itch for a good feature: meld joined
> the crowd of tools with -o to specify an output file in v1.5.0.
>
> http://thread.gmane.org/gmane.comp.gnome.meld.general/1270
What's the best way to use this and not break existing users?
meld v1.5.0 was released in December.
We could parse `meld --version` and use the new --output flag on
newer setups, leaving old setups alone. That's a lot of
code to carry around but it's nicest to users.
Here's another idea..
mergetool--lib has vimdiff and vimdiff2. Maybe we can add a new
meld3 tool that uses the --output flag? Users with older setups
are unaffected. Documentation is changed to mention meld v1.5.0
and the meld3 tool. New users have to configure :-/
Alternatively, rename the existing meld to meld2 and let the
new style call take over the current meld tool.
Older setups with new git that use meld can adjust their
config.
(and the final option: refactor mergetool--lib into separate
files. Yes, we should do that too! ;-))
what do you think?
--
David
next prev parent reply other threads:[~2011-08-11 9:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20110810160356.GA32126@ortolo.eu>
2011-08-10 16:12 ` git-mergetool: wrap tools with 3 files only to use the BASE file instead of MERGED Jonathan Nieder
2011-08-10 17:24 ` Tanguy Ortolo
2011-08-10 19:23 ` Sebastian Schuberth
2011-08-11 8:38 ` David Aguilar
2011-08-11 8:49 ` Jonathan Nieder
2011-08-11 9:37 ` David Aguilar [this message]
2011-08-11 9:48 ` Sebastian Schuberth
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=20110811093731.GB29507@gmail.com \
--to=davvid@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=sschuberth@gmail.com \
--cc=tanguy+debian@ortolo.eu \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.