From: greened@obbligato.org (David A. Greene)
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v3 contrib/subtree 1/1] Add a test for subtree rebase that loses commits
Date: Sun, 17 Jan 2016 17:36:19 -0600 [thread overview]
Message-ID: <87h9ibaido.fsf@waller.obbligato.org> (raw)
In-Reply-To: <CAPig+cTMAnbyT3-FFN4juUooosiydOCX-ETwTghpnKoOeXcMpQ@mail.gmail.com> (Eric Sunshine's message of "Sun, 17 Jan 2016 18:32:44 -0500")
Eric Sunshine <sunshine@sunshineco.com> writes:
> On Sun, Jan 17, 2016 at 6:13 PM, David Greene <greened@obbligato.org> wrote:
>> From: David A. Greene <greened@obbligato.org>
>>
>> This test merges an external tree in as a subtree, makes some commits
>> on top of it and splits it back out. In the process the added commits
>> are lost or the rebase aborts with an internal error. The tests are
>> marked to expect failure so that we don't forget to fix it.
>>
>> Signed-off-by: David A. Greene <greened@obbligato.org>
>> ---
>>
>> Notes:
>> Change History:
>>
>> v1 - Initial version
>> v2 - Additional tests and code cleanup
>> v3 - Remove check_equal, mark comments on failure and remove
>> test_debug statements
>
> Hmm, the v3 changes described here don't appear in this version. In
> fact, v2 and v3 are identical.
Dang, you caught me before I could reply. :)
Yes, I botched this one. Sending v4... ;)
-David
next prev parent reply other threads:[~2016-01-17 23:36 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-05 4:40 [PATCH] Test rebase -Xsubtree David Greene
2016-01-05 4:40 ` [PATCH] Add a test for subtree rebase that loses commits David Greene
2016-01-05 8:47 ` Torsten Bögershausen
2016-01-05 9:57 ` Dennis Kaarsemaker
2016-01-05 11:18 ` Torsten Bögershausen
2016-01-05 20:34 ` Eric Sunshine
2016-01-05 21:14 ` David A. Greene
2016-01-10 23:08 ` [PATCH v2] Test rebase -Xsubtree David Greene
2016-01-10 23:08 ` [PATCH] Add a test for subtree rebase that loses commits David Greene
2016-01-15 1:19 ` Eric Sunshine
2016-01-17 22:50 ` David A. Greene
2016-01-17 23:13 ` [PATCH v3 contrib/subtree 1/1] " David Greene
2016-01-17 23:32 ` Eric Sunshine
2016-01-17 23:36 ` David A. Greene [this message]
2016-01-17 23:43 ` [PATCH v4 1/1] contrib/subtree: " David Greene
2016-01-18 18:10 ` Eric Sunshine
2016-01-19 2:53 ` David A. Greene
2016-01-19 2:59 ` [PATCH v5 " David Greene
2016-01-19 4:21 ` Eric Sunshine
2016-01-19 17:41 ` Junio C Hamano
2016-01-20 4:10 ` David A. Greene
2016-04-12 23:27 ` Junio C Hamano
2016-06-28 10:55 ` David A. Greene
2016-06-28 10:54 ` [PATCH v6 " David Greene
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=87h9ibaido.fsf@waller.obbligato.org \
--to=greened@obbligato.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.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.