From: Mike Hommey <mh@glandium.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Nicolas Pitre <nico@cam.org>,
git@vger.kernel.org, Jon Smirl <jonsmirl@gmail.com>
Subject: Re: [OT] perhaps we want to support copied-context diff output
Date: Sat, 8 Dec 2007 09:53:02 +0100 [thread overview]
Message-ID: <20071208085302.GA13432@glandium.org> (raw)
In-Reply-To: <7vmyslwqdr.fsf@gitster.siamese.dyndns.org>
> Perhaps we may want to add "diff -c" (copied context) output format as
> an option, which may be easier to read.
Or maybe use the patience diff.
On a testcase I had a few months ago, patience diff would give:
@@ -42,11 +42,10 @@
include $(DEPTH)/config/autoconf.mk
+EXTRA_COMPONENTS = nsKillAll.js
+
include $(topsrcdir)/config/rules.mk
-libs::
- $(INSTALL) $(srcdir)/nsKillAll.js $(DIST)/bin/components
-
clean::
rm -f $(DIST)/bin/components/nsKillAll.js
Where "normal" diff would give:
@@ -42,10 +42,9 @@
include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
+EXTRA_COMPONENTS = nsKillAll.js
-libs::
- $(INSTALL) $(srcdir)/nsKillAll.js $(DIST)/bin/components
+include $(topsrcdir)/config/rules.mk
clean::
rm -f $(DIST)/bin/components/nsKillAll.js
git outputs the same as the normal diff, bzr and svn seem to use the
patience diff. Mercurial outputs almost the same as bzr and svn:
@@ -42,10 +42,9 @@
include $(DEPTH)/config/autoconf.mk
+EXTRA_COMPONENTS = nsKillAll.js
+
include $(topsrcdir)/config/rules.mk
-
-libs::
- $(INSTALL) $(srcdir)/nsKillAll.js $(DIST)/bin/components
clean::
rm -f $(DIST)/bin/components/nsKillAll.js
Mike
next prev parent reply other threads:[~2007-12-08 8:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-08 5:00 [PATCH 1/2] pack-objects: reverse the delta search sort list Nicolas Pitre
2007-12-08 8:18 ` [OT] perhaps we want to support copied-context diff output Junio C Hamano
2007-12-08 8:53 ` Mike Hommey [this message]
2007-12-08 11:10 ` Peter Baumann
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=20071208085302.GA13432@glandium.org \
--to=mh@glandium.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonsmirl@gmail.com \
--cc=nico@cam.org \
/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.