threads / discuss / 3018

RE: git pull on Linux/ACPI release tree

Subject: RE: git pull on Linux/ACPI release tree

## tl;dr

3 messages between Jan 9, 2006 and Jan 9, 2006.

replies: 2people: 3as markdown or json

Brown, Len· Jan 9, 2006, 07:34 UTC · lore

Martin, I appologize for using the phrase "completely insane". The rebase proposal caught me somewhat off-guard and I was expressing surprise -- hopefully not taken as insult.

Further, I thank you for your thoughful follow-up.

While I don't expect it to become a routine occurnece for me, I do see that rebase has utility in some situations.

-Len - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Martin Langhoff· Jan 9, 2006, 10:11 UTC · lore

Re: git pull on Linux/ACPI release tree

On 1/9/06, Brown, Len <len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> wrote:
Show 5 quoted lines
> I appologize for using the phrase "completely insane".
> The rebase proposal caught me somewhat off-guard and
> I was expressing surprise -- hopefully not taken as insult.
>
> Further, I thank you for your thoughful follow-up.

No worries... and no offence taken! In a sense we are still exploring possible/desirable workflows and what the missing pieces are. And yes, some thing don't quite make sense from the outside, perhaps because they just don't or because we arent' explaining them very well.

In a sense, we do have a bit of a challenge explaining what how all the parts fit together, even to bk old timers it seems.

> While I don't expect it to become a routine occurnece for me,
> I do see that rebase has utility in some situations.

As long as you've got enough tools to use a workflow that fits you, it's all good.

cheers,

martin - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Johannes Schindelin· Jan 9, 2006, 12:31 UTC · re: Martin Langhoff · lore

Re: git pull on Linux/ACPI release tree

Hi,
On Mon, 9 Jan 2006, Martin Langhoff wrote:
> In a sense we are still exploring possible/desirable workflows and what 
> the missing pieces are. And yes, some thing don't quite make sense from 
> the outside, perhaps because they just don't or because we arent' 
> explaining them very well.
Maybe what is needed here is this:
T1 - T2 .. Tn .. Tp
  \         \      \
   \         M1     M2
    \       /      /
     B1 .. Bm .. Bo

where T1..Tp are the upstream commits, B1..Bo are the local commits, and M1.. are the test merges just to make sure nothing breaks?

As long as the Mx commits resolve automatically, no need for an explicit merge in the Bx commits, since a pull from B into T will just recreate an Mx as next commit in T.

Kind of "throw away merge".

Ciao, Dscho

← back to recent threads