git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 17/18] revert: Introduce --continue to continue the operation

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Aug 9, 2011, 05:26 UTC
Message-ID
<CALkWK0my7_Ocd9eFfGVcJreOJVkC_OyaUo1Q_U7o0mW04ab-YQ@mail.gmail.com>
In-Reply-To
<7vobzzwvug.fsf@alter.siamese.dyndns.org>
Hi Junio,
Junio C Hamano writes:
Show 5 quoted lines
> Ramkumar Ramachandra <artagnon@gmail.com> writes:
>
>> Junio: Here's another small fixup patch for your convenience.
>
> Not very convenient I am afraid ;-)

Hm, I actually thought about this a bit. Due to the volume of patches you have to pick up and apply from emails everyday, I figured that you must have optimized your email-patch application pipeline to such a ridiculous extent that it's probably faster for you to apply patches than even typing out a word. A quick interactive rebase with autosquash will then fix rr/revert-cherry-pick-continue, no?

>> --8<--
>
> This seems to be too short for "am -c"; have you tried applying it
> yourself first before sending it out?

No, I haven't tried this. Will try it and patch "am -c" if necessary, because I like this minimal scissor (picked it up from Jonathan I think).

Show 6 quoted lines
>> -test_expect_success '--signoff is not automatically propogated to
>> resolved conflict' '
>> +test_expect_success '--signoff is not automatically propagated to
>> resolved conflict' '
>
> Linewrapped.

Ugh. Classic GMail web interface mistake. I sometimes risk sending small patches without git-send-email, and this is what happens. Nothing helps: mutt's single-threaded'ness is starting to get on my nerves now.

> I'll squash this manually, so no need to resend. Thanks.
Thanks.
-- Ram
Previous: Junio C HamanoNext: Ramkumar Ramachandra
Message 24 of 25 in “Sequencer for inclusion v6”
  1. 00/18 Sequencer for inclusion v6Ramkumar Ramachandra, Aug 4, 2011
  2. 01/18 advice: Introduce error_resolve_conflictRamkumar Ramachandra, Aug 4, 2011
  3. 02/18 config: Introduce functions to write non-standard fileRamkumar Ramachandra, Aug 4, 2011
  4. 03/18 revert: Simplify and inline add_message_to_msgRamkumar Ramachandra, Aug 4, 2011
  5. 04/18 revert: Don't check lone argument in get_encodingRamkumar Ramachandra, Aug 4, 2011
  6. 05/18 revert: Rename no_replay to record_originRamkumar Ramachandra, Aug 4, 2011
  7. 06/18 revert: Eliminate global "commit" variableRamkumar Ramachandra, Aug 4, 2011
  8. 07/18 revert: Introduce struct to keep command-line optionsRamkumar Ramachandra, Aug 4, 2011
  9. 08/18 revert: Separate cmdline parsing from functional codeRamkumar Ramachandra, Aug 4, 2011
  10. 09/18 revert: Don't create invalid replay_opts in parse_argsRamkumar Ramachandra, Aug 4, 2011
  11. 10/18 revert: Save data for continuing after conflict resolutionRamkumar Ramachandra, Aug 4, 2011
  12. 11/18 revert: Save command-line options for continuing operationRamkumar Ramachandra, Aug 4, 2011
  13. 12/18 revert: Make pick_commits functionally act on a commit listRamkumar Ramachandra, Aug 4, 2011
  14. 13/18 revert: Introduce --reset to remove sequencer stateRamkumar Ramachandra, Aug 4, 2011
  15. 14/18 reset: Make reset remove the sequencer stateRamkumar Ramachandra, Aug 4, 2011
  16. Christian CouderAug 8, 2011
  17. Ramkumar RamachandraAug 8, 2011
  18. 15/18 revert: Remove sequencer state when no commits are pendingRamkumar Ramachandra, Aug 4, 2011
  19. 16/18 revert: Don't implicitly stomp pending sequencer operationRamkumar Ramachandra, Aug 4, 2011
  20. 17/18 revert: Introduce --continue to continue the operationRamkumar Ramachandra, Aug 4, 2011
  21. Christian CouderAug 8, 2011
  22. Ramkumar RamachandraAug 8, 2011
  23. Junio C HamanoAug 8, 2011
  24. Ramkumar RamachandraAug 9, 2011
  25. 18/18 revert: Propagate errors upwards from do_pick_commitRamkumar Ramachandra, Aug 4, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.