From: Junio C Hamano <gitster@pobox.com>
To: Morten Welinder <mwelinder@gmail.com>
Cc: Kevin <ikke@ikke.info>, git <git@vger.kernel.org>
Subject: Re: Fwd: possible Improving diff algoritm
Date: Wed, 12 Dec 2012 13:53:51 -0800 [thread overview]
Message-ID: <7vpq2f2az4.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CANv4PNm45xGBn2veKi1o0wB4K9NgsbtCsiymHNO4xbCDpJ5tDg@mail.gmail.com> (Morten Welinder's message of "Wed, 12 Dec 2012 16:40:32 -0500")
Morten Welinder <mwelinder@gmail.com> writes:
> Is there a reason why picking among the choices in a sliding window
> must be contents neutral?
Sorry, you might be getting at something interesting but I do not
understand the question. I have no idea what you mean by "contents
neutral".
Picking between these two choices
/** + /**
+ * Default parent + * Default parent
+ * + *
+ * @var int + * @var int
+ * @access protected + * @access protected
+ * @index + * @index
+ */ + */
+ protected $defaultParent; + protected $defaultParent;
+ +
+ /** /**
would not affect the correctness of the patch. You may pick
whatever you deem the most desirable, but your answer must be a
correct patch (the definition of "correct" here is "applying that
patch to the preimage produces the intended postimage").
And I think if you inserted a block of text B after a context C
where the tail of B matches the tail of C like the above, you can
shift what you treat as "inserted" up and still come up with a
correct patch.
The output being "a correct patch" is not the only thing we need to
consider, though, as I mentioned in another response to Kevin
regarding the "consequences".
next prev parent reply other threads:[~2012-12-12 21:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAO54GHC4AXQO1MbU2qXMdcDO5mtUFhrXfXND5evc93kQhNfCrw@mail.gmail.com>
2012-12-12 15:03 ` Fwd: possible Improving diff algoritm Kevin
2012-12-12 18:29 ` Junio C Hamano
2012-12-12 18:48 ` Brian J. Murrell
2012-12-12 19:30 ` Kevin
2012-12-12 20:29 ` Junio C Hamano
2012-12-12 21:40 ` Morten Welinder
2012-12-12 21:53 ` Junio C Hamano [this message]
2012-12-12 22:34 ` Andrew Ardill
2012-12-12 23:32 ` Javier Domingo
2012-12-12 23:43 ` Junio C Hamano
2012-12-12 23:49 ` Javier Domingo
2012-12-13 0:00 ` Michael Haggerty
2012-12-13 1:55 ` Morten Welinder
2012-12-13 4:58 ` Geert Bosch
2012-12-13 6:26 ` Junio C Hamano
2012-12-14 12:20 ` Javier Domingo
2012-12-14 22:29 ` Bernhard R. Link
2012-12-15 12:16 ` Javier Domingo
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vpq2f2az4.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=ikke@ikke.info \
--cc=mwelinder@gmail.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://80x24.org/mirrors/git.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).