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

Re: [PATCH v4 42/45] add tests for rebasing merged history

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Jun 9, 2013, 17:31 UTC
Message-ID
<CAMP44s30YkE5i7B==pyB8zkNxu=YoGvP1=V_2LqOe_frXV+cfQ@mail.gmail.com>
In-Reply-To
<87wqq3ci1n.fsf@hexa.v.cablecom.net>
On Sun, Jun 9, 2013 at 12:25 PM, Thomas Rast <trast@inf.ethz.ch> wrote:
Show 12 quoted lines
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>> +#TODO: make order consistent across all flavors of rebase
>> +test_run_rebase success 'd e n o' ''
>> +test_run_rebase success 'd e n o' -m
>> +test_run_rebase success 'd n o e' -i
>
> [45/45] would seem to imply that these tests fail as of this patch.  Is
> that correct?
>
> If so, please either squash that change or move the test further up
> marked as 'failure'.
I won't. The whole purpose of the last patch is to show these tests are fixed.

Martin von Zweigbergk's patch series is independent of this one, I merely added it to show the above.

Eventually Martin's patch series will be merged, while mine probably won't.
-- 
Felipe Contreras
Previous: Thomas RastNext: Thomas Rast
Message 79 of 86 in “Massive improvents to rebase and cherry-pick”
  1. 00/45 Massive improvents to rebase and cherry-pickFelipe Contreras, Jun 9, 2013
  2. 01/45 build: generate and clean test scriptsFelipe Contreras, Jun 9, 2013
  3. 02/45 build: do not install git-remote-testgitFelipe Contreras, Jun 9, 2013
  4. 03/45 build: trivial cleanupFelipe Contreras, Jun 9, 2013
  5. SZEDER GáborJun 9, 2013
  6. 04/45 build: add builtin libFelipe Contreras, Jun 9, 2013
  7. 05/45 log-tree: remove dependency from sequencerFelipe Contreras, Jun 9, 2013
  8. 06/45 Move sequencer to builtinFelipe Contreras, Jun 9, 2013
  9. Antoine PelisseJun 9, 2013
  10. Felipe ContrerasJun 9, 2013
  11. Ramkumar RamachandraJun 9, 2013
  12. Antoine PelisseJun 9, 2013
  13. 07/45 unpack-trees: plug a memory leakFelipe Contreras, Jun 9, 2013
  14. 08/45 read-cache: plug a few leaksFelipe Contreras, Jun 9, 2013
  15. 09/45 sequencer: remove useless indentationFelipe Contreras, Jun 9, 2013
  16. Fredrik GustafssonJun 9, 2013
  17. Felipe ContrerasJun 9, 2013
  18. Fredrik GustafssonJun 9, 2013
  19. Felipe ContrerasJun 9, 2013
  20. Fredrik GustafssonJun 9, 2013
  21. 10/45 sequencer: trivial fixFelipe Contreras, Jun 9, 2013
  22. SZEDER GáborJun 9, 2013
  23. Felipe ContrerasJun 9, 2013
  24. SZEDER GáborJun 9, 2013
  25. John KeepingJun 9, 2013
  26. Felipe ContrerasJun 9, 2013
  27. John KeepingJun 9, 2013
  28. Felipe ContrerasJun 9, 2013
  29. SZEDER GáborJun 9, 2013
  30. Felipe ContrerasJun 9, 2013
  31. SZEDER GáborJun 9, 2013
  32. Felipe ContrerasJun 9, 2013
  33. Philip OakleyJun 9, 2013
  34. 11/45 cherry-pick: don't barf when there's nothing to doFelipe Contreras, Jun 9, 2013
  35. Fredrik GustafssonJun 9, 2013
  36. Felipe ContrerasJun 9, 2013
  37. 12/45 cherry-pick: add --skip-empty optionFelipe Contreras, Jun 9, 2013
  38. 13/45 revert/cherry-pick: add --quiet optionFelipe Contreras, Jun 9, 2013
  39. 14/45 revert/cherry-pick: add --skip optionFelipe Contreras, Jun 9, 2013
  40. 15/45 builtin: add rewrite helperFelipe Contreras, Jun 9, 2013
  41. 16/45 cherry-pick: store rewritten commitsFelipe Contreras, Jun 9, 2013
  42. 17/45 cherry-pick: don't store skipped commitFelipe Contreras, Jun 9, 2013
  43. 18/45 builtin: move run_rewrite_hook() to rewrite.cFelipe Contreras, Jun 9, 2013
  44. 19/45 builtin: add copy_rewrite_notes()Felipe Contreras, Jun 9, 2013
  45. 20/45 cherry-pick: copy notes and run hooksFelipe Contreras, Jun 9, 2013
  46. Thomas RastJun 9, 2013
  47. Felipe ContrerasJun 9, 2013
  48. 21/45 cherry-pick: add --action-name optionFelipe Contreras, Jun 9, 2013
  49. 22/45 cherry-pick: remember rerere-autoupdateFelipe Contreras, Jun 9, 2013
  50. 23/45 rebase: split the cherry-pick stuffFelipe Contreras, Jun 9, 2013
  51. 24/45 rebase: cherry-pick: fix mode storageFelipe Contreras, Jun 9, 2013
  52. 25/45 rebase: cherry-pick: fix sequence continuationFelipe Contreras, Jun 9, 2013
  53. 26/45 rebase: cherry-pick: fix abort of cherry modeFelipe Contreras, Jun 9, 2013
  54. 27/45 rebase: cherry-pick: fix command invocationsFelipe Contreras, Jun 9, 2013
  55. 28/45 rebase: cherry-pick: fix status messagesFelipe Contreras, Jun 9, 2013
  56. 29/45 rebase: cherry-pick: automatically commit stageFelipe Contreras, Jun 9, 2013
  57. 30/45 rebase: cherry-pick: set correct action-nameFelipe Contreras, Jun 9, 2013
  58. 31/45 rebase: trivial cleanupFelipe Contreras, Jun 9, 2013
  59. Fredrik GustafssonJun 9, 2013
  60. Junio C HamanoJun 11, 2013
  61. Fredrik GustafssonJun 11, 2013
  62. Felipe ContrerasJun 11, 2013
  63. Fredrik GustafssonJun 11, 2013
  64. Felipe ContrerasJun 11, 2013
  65. Fredrik GustafssonJun 11, 2013
  66. Felipe ContrerasJun 11, 2013
  67. 32/45 rebase: use 'cherrypick' mode instead of 'am'Felipe Contreras, Jun 9, 2013
  68. 33/45 rebase: cherry-pick: fix for shell promptFelipe Contreras, Jun 9, 2013
  69. 34/45 rebase: cherry-pick: add merge optionsFelipe Contreras, Jun 9, 2013
  70. 35/45 rebase: remove merge modeFelipe Contreras, Jun 9, 2013
  71. 36/45 rebase: cherry-pick: add copyrightFelipe Contreras, Jun 9, 2013
  72. 37/45 tests: fix autostashFelipe Contreras, Jun 9, 2013
  73. 38/45 add simple tests of consistency across rebase typesFelipe Contreras, Jun 9, 2013
  74. 39/45 add tests for rebasing with patch-equivalence presentFelipe Contreras, Jun 9, 2013
  75. 40/45 add tests for rebasing of empty commitsFelipe Contreras, Jun 9, 2013
  76. 41/45 add tests for rebasing rootFelipe Contreras, Jun 9, 2013
  77. 42/45 add tests for rebasing merged historyFelipe Contreras, Jun 9, 2013
  78. Thomas RastJun 9, 2013
  79. Felipe ContrerasJun 9, 2013
  80. Thomas RastJun 9, 2013
  81. Felipe ContrerasJun 9, 2013
  82. 43/45 t3406: modernize styleFelipe Contreras, Jun 9, 2013
  83. 44/45 tests: move test for rebase messages from t3400 to t3406Felipe Contreras, Jun 9, 2013
  84. 45/45 tests: update topology testsFelipe Contreras, Jun 9, 2013
  85. Martin von ZweigbergkJun 11, 2013
  86. Felipe ContrerasJun 11, 2013

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.