user/dev discussion of public-inbox itself
 help / color / Atom feed
From: Eric Wong <>
Subject: [PATCH 1/3] solver: try the next patch on apply failures
Date: Thu,  2 Jan 2020 09:24:57 +0000
Message-ID: <> (raw)
In-Reply-To: <>

Sometimes a patch is corrupted and resent to create the same
OID.  We need to account for that case and actually move onto
the next patch instead of blindly trying "git ls-files" to get
nothing out of it.
 lib/PublicInbox/ | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/PublicInbox/ b/lib/PublicInbox/
index c57fb4c6..3e3a5899 100644
--- a/lib/PublicInbox/
+++ b/lib/PublicInbox/
@@ -452,6 +452,7 @@ sub apply_result ($$) {
 		if ($nxt && oids_same_ish($nxt->{oid_b}, $di->{oid_b})) {
 			dbg($self, $msg);
 			dbg($self, 'trying '.di_url($self, $nxt));
+			return do_git_apply($self);
 		} else {
 			ERR($self, $msg);

  reply index

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-02  9:24 [PATCH 0/3] solver bugfixes and tweaks Eric Wong
2020-01-02  9:24 ` Eric Wong [this message]
2020-01-02  9:24 ` [PATCH 2/3] solver: extract_diff: deal with missing "diff --git" line Eric Wong
2020-01-02  9:36   ` Eric Wong
2020-01-02 19:04     ` Eric Wong
2020-01-02 21:12   ` Eric Wong
2020-01-03  0:43   ` Eric Wong
2020-01-02  9:24 ` [PATCH 3/3] qspawn: use per-call quiet flag for solver Eric Wong

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Example config snippet for mirrors

Newsgroups are available over NNTP:

 note: .onion URLs require Tor:

AGPL code for this site: git clone