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

Re: [PATCH 00/21] replacement for dt/refs-backend-lmdb v7 patch 04/33

From
Michael Haggerty <mhagger@alum.mit.edu>
Date
Mar 30, 2016, 06:37 UTC
Message-ID
<56FB743C.3020902@alum.mit.edu>
In-Reply-To
<1459282370.2976.7.camel@twopensource.com>
On 03/29/2016 10:12 PM, David Turner wrote:
Show 28 quoted lines
> On Sun, 2016-03-27 at 07:22 +0200, Michael Haggerty wrote:
>> On 03/24/2016 07:47 AM, David Turner wrote:
>>> [...]
>>> I incorporated your changes into the lmdb backend.  To make merging
>>> later more convenient, I rebased on top of pu -- I think this
>>> mainly
>>> depends on jk/check-repository-format, but I also included some
>>> fixes
>>> for a couple of tests that had been changed by other patches.
>>
>> I think rebasing changes on top of pu is counterproductive. I believe
>> that Junio had extra work rebasing your earlier series onto a merge
>> of
>> the minimum number of topics that it really depended on. There is no
>> way
>> that he could merge the branch in this form because it would imply
>> merging all of pu.
>>
>> See the zeroth section of SubmittingPatches [1] for the guidelines.
> 
> I'm a bit confused because 
> [PATCH 18/21] get_default_remote(): remove unneeded flag variable
> 
> doesn't do anything on master -- it depends on some patch in pu.  And
> we definitely want to pick up jk/check-repository-format (which doesn't
> include whatever 18/21 depends on).
> 
> So what do you think our base should be?

I think the preference is to base a patch series on the merge of master plus the minimum number of topics in pu (ideally, none) that are "essential" prerequisites of the changes in the patch series. For example, the version of this patch series that Junio has in his tree was based on master + sb/submodule-parallel-update. Even if there are minor conflicts with another in-flight topic, it is easier for Junio to resolve the conflicts when merging the topics together than to rebase the patch series over and over as the other patch series evolves. The goal of this practice is of course to allow patch series to evolve independently of each other as much as possible.

Of course if you have insights into nontrivial conflicts between your patch series and others, it would be helpful to discuss these in your cover letter.

Michael
Previous: David TurnerNext: David Turner
Message 26 of 31 in “replacement for dt/refs-backend-lmdb v7 patch 04/33”
  1. 00/21 replacement for dt/refs-backend-lmdb v7 patch 04/33Michael Haggerty, Mar 23, 2016
  2. 01/21 t1430: test the output and error of some commands more carefullyMichael Haggerty, Mar 23, 2016
  3. 02/21 t1430: clean up broken refs/tags/shadowMichael Haggerty, Mar 23, 2016
  4. 03/21 t1430: don't rely on symbolic-ref for creating broken symrefsMichael Haggerty, Mar 23, 2016
  5. 04/21 t1430: test for-each-ref in the presence of badly-named refsMichael Haggerty, Mar 23, 2016
  6. 05/21 t1430: improve test coverage of deletion of badly-named refsMichael Haggerty, Mar 23, 2016
  7. 06/21 resolve_missing_loose_ref(): simplify semanticsMichael Haggerty, Mar 23, 2016
  8. 07/21 resolve_ref_unsafe(): use for loop to count up to MAXDEPTHMichael Haggerty, Mar 23, 2016
  9. 08/21 resolve_ref_unsafe(): ensure flags is always setMichael Haggerty, Mar 23, 2016
  10. 09/21 resolve_ref_1(): eliminate local variableMichael Haggerty, Mar 23, 2016
  11. 10/21 resolve_ref_1(): reorder codeMichael Haggerty, Mar 23, 2016
  12. 11/21 resolve_ref_1(): eliminate local variable "bad_name"Michael Haggerty, Mar 23, 2016
  13. 12/21 files-backend: break out ref readingMichael Haggerty, Mar 23, 2016
  14. 13/21 read_raw_ref(): manage own scratch spaceMichael Haggerty, Mar 23, 2016
  15. 14/21 Inline resolve_ref_1() into resolve_ref_unsafe()Michael Haggerty, Mar 23, 2016
  16. 15/21 read_raw_ref(): change flags parameter to unsigned intMichael Haggerty, Mar 23, 2016
  17. 16/21 fsck_head_link(): remove unneeded flag variableMichael Haggerty, Mar 23, 2016
  18. 17/21 cmd_merge(): remove unneeded flag variableMichael Haggerty, Mar 23, 2016
  19. 18/21 get_default_remote(): remove unneeded flag variableMichael Haggerty, Mar 23, 2016
  20. 19/21 checkout_paths(): remove unneeded flag variableMichael Haggerty, Mar 23, 2016
  21. 20/21 check_aliased_update(): check that dst_name is non-NULLMichael Haggerty, Mar 23, 2016
  22. 21/21 show_head_ref(): check the result of resolve_ref_namespace()Michael Haggerty, Mar 23, 2016
  23. David TurnerMar 24, 2016
  24. Michael HaggertyMar 27, 2016
  25. David TurnerMar 29, 2016
  26. Michael HaggertyMar 30, 2016
  27. David TurnerMar 30, 2016
  28. Michael HaggertyMar 31, 2016
  29. David TurnerMar 31, 2016
  30. Stefan BellerApr 1, 2016
  31. David TurnerApr 1, 2016

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.