{"thread":{"id":"3018","subject":"RE: git pull on Linux/ACPI release tree","startedAt":"2006-01-09T07:34:56Z","lastAt":"2006-01-09T12:31:52Z","messageCount":3,"participants":["Brown, Len","Martin Langhoff","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"14347","messageId":"F7DC2337C7631D4386A2DF6E8FB22B3005A136FE@hdsmsx401.amr.corp.intel.com","threadId":"3018","inReplyTo":null,"subject":"RE: git pull on Linux/ACPI release tree","fromName":"Brown, Len","fromEmail":"len.brown-ral2jqcrhueavxtiumwx3w@public.gmane.org","sentAt":"2006-01-09T07:34:56Z","receivedAt":"2006-01-09T07:34:56Z","isPatch":false,"sender":{"key":"len.brown-ral2jqcrhueavxtiumwx3w@public.gmane.org","avatar":null},"body":"Martin,\nI appologize for using the phrase \"completely insane\".\nThe rebase proposal caught me somewhat off-guard and\nI was expressing surprise -- hopefully not taken as insult.\n\nFurther, I thank you for your thoughful follow-up.\n\nWhile I don't expect it to become a routine occurnece for me,\nI do see that rebase has utility in some situations.\n\n-Len\n-\nTo unsubscribe from this list: send the line \"unsubscribe linux-acpi\" in\nthe body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\nMore majordomo info at  http://vger.kernel.org/majordomo-info.html\n"},{"id":"14356","messageId":"46a038f90601090211j33479764q13c74df60033a061@mail.gmail.com","threadId":"3018","inReplyTo":"F7DC2337C7631D4386A2DF6E8FB22B3005A136FE-N2PTB0HCzHKkrb+BlOpmy7fspsVTdybXVpNB7YpNyf8@public.gmane.org","subject":"Re: git pull on Linux/ACPI release tree","fromName":"Martin Langhoff","fromEmail":"martin.langhoff-re5jqeeqqe8avxtiumwx3w@public.gmane.org","sentAt":"2006-01-09T10:11:20Z","receivedAt":"2006-01-09T10:11:20Z","isPatch":false,"sender":{"key":"martin.langhoff-re5jqeeqqe8avxtiumwx3w@public.gmane.org","avatar":null},"body":"On 1/9/06, Brown, Len <len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> wrote:\n> I appologize for using the phrase \"completely insane\".\n> The rebase proposal caught me somewhat off-guard and\n> I was expressing surprise -- hopefully not taken as insult.\n>\n> Further, I thank you for your thoughful follow-up.\n\nNo worries... and no offence taken! In a sense we are still exploring\npossible/desirable workflows and what the missing pieces are. And yes,\nsome thing don't quite make sense from the outside, perhaps because\nthey just don't or because we arent' explaining them very well.\n\nIn a sense, we do have a bit of a challenge explaining what how all\nthe parts fit together, even to bk old timers it seems.\n\n> While I don't expect it to become a routine occurnece for me,\n> I do see that rebase has utility in some situations.\n\nAs long as you've got enough tools to use a workflow that fits you,\nit's all good.\n\ncheers,\n\n\nmartin\n-\nTo unsubscribe from this list: send the line \"unsubscribe linux-acpi\" in\nthe body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\nMore majordomo info at  http://vger.kernel.org/majordomo-info.html\n"},{"id":"14360","messageId":"Pine.LNX.4.63.0601091320420.2503@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"3018","inReplyTo":"46a038f90601090211j33479764q13c74df60033a061@mail.gmail.com","subject":"Re: git pull on Linux/ACPI release tree","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-01-09T12:31:52Z","receivedAt":"2006-01-09T12:31:52Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 9 Jan 2006, Martin Langhoff wrote:\n\n> In a sense we are still exploring possible/desirable workflows and what \n> the missing pieces are. And yes, some thing don't quite make sense from \n> the outside, perhaps because they just don't or because we arent' \n> explaining them very well.\n\nMaybe what is needed here is this:\n\nT1 - T2 .. Tn .. Tp\n  \\         \\      \\\n   \\         M1     M2\n    \\       /      /\n     B1 .. Bm .. Bo\n\nwhere T1..Tp are the upstream commits, B1..Bo are the local commits, and\nM1.. are the test merges just to make sure nothing breaks?\n\nAs long as the Mx commits resolve automatically, no need for an explicit \nmerge in the Bx commits, since a pull from B into T will just recreate an \nMx as next commit in T.\n\nKind of \"throw away merge\".\n\nCiao,\nDscho\n"}]}