From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Tanky Woo <wtq1990@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Git add -p “Your edited hunk does not apply. Edit again”
Date: Tue, 14 Apr 2015 16:00:49 +0200 [thread overview]
Message-ID: <vpqegnmizce.fsf@anie.imag.fr> (raw)
In-Reply-To: <CALv9gbMshdNhB58Otx5h8rmtCAU4qo9eNTqKSMzD_Phy7Sataw@mail.gmail.com> (Tanky Woo's message of "Tue, 14 Apr 2015 21:52:08 +0800")
Tanky Woo <wtq1990@gmail.com> writes:
> Stash this hunk [y,n,q,a,d,/,j,J,g,e,?]? y
> @@ -2,3 +3,4 @@
> bbb
> +added line 2
> ccc
> ddd
> Stash this hunk [y,n,q,a,d,/,K,g,e,?]? y
My version does n, y, not y, y. The problem is the mix of stashed/not
stashed hunks. See my other message for a reproducible test, it does
fail on Git master.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
prev parent reply other threads:[~2015-04-14 14:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-14 1:56 Git add -p “Your edited hunk does not apply. Edit again” Tanky Woo
2015-04-14 9:43 ` Matthieu Moy
2015-04-14 11:32 ` [PATCH 0/4] demonstrate add -p and stash -p failures Matthieu Moy
2015-04-14 11:32 ` [PATCH 1/4] add -p: demonstrate failure when running 'edit' after a split Matthieu Moy
2015-04-14 20:46 ` Eric Sunshine
2015-04-14 11:32 ` [PATCH 2/4] t3904-stash-patch: fix test description Matthieu Moy
2015-04-14 11:32 ` [PATCH 3/4] t3904-stash-patch: factor PERL prereq at the top of the file Matthieu Moy
2015-04-14 11:32 ` [PATCH 4/4] stash -p: demonstrate failure of split with mixed y/n Matthieu Moy
2015-04-14 20:46 ` Eric Sunshine
2015-04-14 18:00 ` [PATCH 0/4] demonstrate add -p and stash -p failures Junio C Hamano
2015-04-16 7:02 ` [PATCH v2 0/5] " Matthieu Moy
2015-04-16 7:02 ` [PATCH v2 1/5] t3701-add-interactive: simplify code Matthieu Moy
2015-04-16 7:02 ` [PATCH v2 2/5] add -p: demonstrate failure when running 'edit' after a split Matthieu Moy
2015-04-16 7:02 ` [PATCH v2 3/5] t3904-stash-patch: fix test description Matthieu Moy
2015-04-16 7:02 ` [PATCH v2 4/5] t3904-stash-patch: factor PERL prereq at the top of the file Matthieu Moy
2015-04-16 7:02 ` [PATCH v2 5/5] stash -p: demonstrate failure of split with mixed y/n Matthieu Moy
[not found] ` <CALv9gbMshdNhB58Otx5h8rmtCAU4qo9eNTqKSMzD_Phy7Sataw@mail.gmail.com>
2015-04-14 14:00 ` Matthieu Moy [this message]
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=vpqegnmizce.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=wtq1990@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.
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.