{"thread":{"id":"3015","subject":"RE: git pull on Linux/ACPI release tree","startedAt":"2006-01-09T06:13:17Z","lastAt":"2006-01-09T06:13:17Z","messageCount":1,"participants":["Brown, Len"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"14343","messageId":"F7DC2337C7631D4386A2DF6E8FB22B3005A136E9@hdsmsx401.amr.corp.intel.com","threadId":"3015","inReplyTo":null,"subject":"RE: git pull on Linux/ACPI release tree","fromName":"Brown, Len","fromEmail":"len.brown-ral2jqcrhueavxtiumwx3w@public.gmane.org","sentAt":"2006-01-09T06:13:17Z","receivedAt":"2006-01-09T06:13:17Z","isPatch":false,"sender":{"key":"len.brown-ral2jqcrhueavxtiumwx3w@public.gmane.org","avatar":null},"body":" \n>Which just means that a commit that was tested and found to be working \n>might suddenly not work any more, which can be very surprising (\"But I \n>didn't change anything!\").\n\nThis is why I try to follow the top of tree as closely as possible.\nWhile parts of ACPI are well contained, other parts get stomped on constantly.\nMy two updates in 10 hours were not becaudse of what I did,\nit was in response to seeing the flood gates in 2.6.16 open.\n\nAlso, it isn't accurate that nothing changed at my end.\nI put some trivial patches into my release branch,\nudpated the release branch with upstream,\nand then pulled the release branch into my test branch\nwhere there are other patches you haven't seen yet.\n\nI pushed the release branch just to 'clear the deck' of\nthe trivial patches there since there was no reason to delay\nthem behind all the stuff still on the test branch.\n\n>So trying out git-rebase and git-cherry-pick just in case you \n>decide to want to use them might be worthwhile. Making it part of your \n>daily routine like David has done? Somewhat questionable, but hey,\n>it seems to be working for David, and it does make some things much easier, so..\n\nIn the past I have use git-cherry-pick to recover from when a \"good\" patch\nwas checked in on top of a \"bad\" patch, and I wanted to push\nthe good without the bad.\n\nBut the linearization model will not work for me in general.\nBranches enable parallel lines of development in git.  If that\nis thrown out, then we're basically back at quilt.\n\nthanks,\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"}]}