On Sun, Mar 6, 2022 at 8:46 PM Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> wrote: > > What I'm asking about is that Tao Klerks notes upthread: > > Now we support multiple entries being added as a perpetuation of an > existing branch's setup - but what does it *mean*? > > As far as I can tell this isn't the case, but I only dug into it a bit > (I instrumented the relevant tests to start dying if there were multiple > "merge" entries). > > So I couldn't find what if anything changed here recently, but I'm not > saying it didn't, just asking for a clarification. I.e. I didn't find > how "what should we do with this config, if any" had to do with "Josh > Steadman's[sic] recent work on --track=inherit" (re "[sic]": it's > "Steadmon" :). Sorry - the code that handles branch merge entry creation during new branch creation was modified by Josh (my apologies for the surname mistype) as part of the "--track=inherit" work. The previous existing functionality only ever dealt with one tracking branch to be created, but the *concept* of inheritance had to deal with "what if there is more than one to inherit".
