public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox•com>
To: Pete Wyckoff <pw@padd•com>
Cc: git@vger•kernel.org, Luke Diamand <luke@diamand•org>
Subject: Re: What's cooking in git.git (Aug 2012, #06; Sun, 19)
Date: Mon, 20 Aug 2012 15:52:28 -0700	[thread overview]
Message-ID: <7vobm5gor7.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20120820224808.GA30139@padd.com> (Pete Wyckoff's message of "Mon, 20 Aug 2012 18:48:08 -0400")

Pete Wyckoff <pw@padd•com> writes:

> gitster@pobox•com wrote on Mon, 20 Aug 2012 00:00 -0700:
>> * pw/p4-submit-conflicts (2012-08-16) 12 commits
>>  - git p4: add submit --prepare-p4-only option
>>  - git p4: add submit --dry-run option
>>  - git p4: accept -v for --verbose
>>  - git p4: revert deleted files after submit cancel
>>  - git p4: rearrange submit template construction
>>  - git p4: test clean-up after failed submit, fix added files
>>  - git p4: standardize submit cancel due to unchanged template
>>  - git p4: move conflict prompt into run, use [c]ontinue and [q]uit
>>  - git p4: remove submit failure options [a]pply and [w]rite
>>  - git p4: gracefully fail if some commits could not be applied
>>  - git p4 test: use p4d -L option to suppress log messages
>>  - git p4 test: remove bash-ism of combined export/assignment
>> 
>> I saw Pete and Luke going back and forth collaborating, so I take
>> that this may still be rerolled---if not, please holler.
>
> Yes, expect a reroll; this isn't ready to go as-is.  We'll
> continue the back and forth.

Ok, will wait until the dust settles.

>> * pw/p4-use-client-spec-branch-detection (2012-08-11) 5 commits
>>  - git p4: make branch detection work with --use-client-spec
>>  - git p4: do wildcard decoding in stripRepoPath
>>  - git p4: set self.branchPrefixes in initialization
>>  - git p4 test: add broken --use-client-spec --detect-branches tests
>>  - git p4 test: move client_view() function to library
>
> I've got a
>
>     Tested-by: Matthew Korich <matthew@korich•net>
>
> to add in the top-most commit "make branch detection work...".
> Should I send a whole reroll, just one patch, or simply a note
> like this?  In general, for next time, please.

I can amend it here.  Thanks.

      reply	other threads:[~2012-08-20 22:52 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-20  7:00 What's cooking in git.git (Aug 2012, #06; Sun, 19) Junio C Hamano
2012-08-20  7:03 ` Erik Faye-Lund
2012-08-20 16:21   ` Junio C Hamano
2012-08-20 16:23     ` Erik Faye-Lund
2012-08-20 16:35       ` Junio C Hamano
2012-08-20 16:37         ` Erik Faye-Lund
2012-08-20 17:23           ` Junio C Hamano
2012-08-20 22:48 ` Pete Wyckoff
2012-08-20 22:52   ` Junio C Hamano [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=7vobm5gor7.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=luke@diamand$(echo .)org \
    --cc=pw@padd$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox