{"thread":{"id":"17864","subject":"Rebase v.s. fast forward","startedAt":"2009-02-17T23:50:04Z","lastAt":"2009-02-22T19:00:36Z","messageCount":2,"participants":["Alan","Jan Hudec"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"105245","messageId":"1234914604.3334.7.camel@rottwang.fnordora.org","threadId":"17864","inReplyTo":null,"subject":"Rebase v.s. fast forward","fromName":"Alan","fromEmail":"alan@clueserver.org","sentAt":"2009-02-17T23:50:04Z","receivedAt":"2009-02-17T23:50:04Z","isPatch":false,"sender":{"key":"alan@clueserver.org","avatar":null},"body":"I am dealing with a kernel branch of a branch that undergoes frequent\nrebases and I want to know the easiest way of handling things.\n\nThe tree is pulled from kernel.org. Patches are applied to the tree by a\ndeveloper here on a branch.  I take that branch, make my own branch, add\ndrivers and other modifications and publish to a different repo.\n\nNow that 2.6.29 is occurring, every time there is a new RC candidate, he\nrebases the tree and tells everyone to rebuild.  Since the developers on\nmy projects have their own branches off of my tree, rebuilding\neverything is starting to look like a big pain.\n\nIs there a way to take a rebased repository and apply the changes in a\nmanner that does not require reconstructing everything from patches?\n\nCan you fast forward on a rebased repo or are you just hosed?  (Or would\nthat be considered \"frebasing\"?)\n"},{"id":"105813","messageId":"20090222190036.GB6504@efreet.light.src","threadId":"17864","inReplyTo":"1234914604.3334.7.camel@rottwang.fnordora.org","subject":"Re: Rebase v.s. fast forward","fromName":"Jan Hudec","fromEmail":"bulb@ucw.cz","sentAt":"2009-02-22T19:00:36Z","receivedAt":"2009-02-22T19:00:36Z","isPatch":false,"sender":{"key":"bulb@ucw.cz","avatar":null},"body":"On Tue, Feb 17, 2009 at 15:50:04 -0800, Alan wrote:\n> I am dealing with a kernel branch of a branch that undergoes frequent\n> rebases and I want to know the easiest way of handling things.\n> \n> The tree is pulled from kernel.org. Patches are applied to the tree by a\n> developer here on a branch.  I take that branch, make my own branch, add\n> drivers and other modifications and publish to a different repo.\n> \n> Now that 2.6.29 is occurring, every time there is a new RC candidate, he\n> rebases the tree and tells everyone to rebuild.  Since the developers on\n> my projects have their own branches off of my tree, rebuilding\n> everything is starting to look like a big pain.\n> \n> Is there a way to take a rebased repository and apply the changes in a\n> manner that does not require reconstructing everything from patches?\n\nNo, there is not. When you have some changes on top of rebased branch, you\nhave to rebase them.\n\n> Can you fast forward on a rebased repo or are you just hosed?  (Or would\n> that be considered \"frebasing\"?)\n\nWell, fast-forward condition is when you pull and you have no local changes.\nWhich I guess is not your case.\n\nI am not sure whether pull properly detects the case, where the pulled branch\ngot rebased (so strictly-speaking it's not a fast-forward), but there are no\nlocal changes, but since you probably do have some local changes, it would\nnot help you.\n\n-- \n\t\t\t\t\t\t Jan 'Bulb' Hudec <bulb@ucw.cz>\n"}]}