{"thread":{"id":"21110","subject":"stgit, rebasing with 100 patches","startedAt":"2009-10-01T23:04:14Z","lastAt":"2009-11-02T08:22:13Z","messageCount":3,"participants":["Jon Smirl","Karl Wiberg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"124105","messageId":"9e4733910910011604w68cdca86l2baa2f2fe4db4a32@mail.gmail.com","threadId":"21110","inReplyTo":null,"subject":"stgit, rebasing with 100 patches","fromName":"Jon Smirl","fromEmail":"jonsmirl@gmail.com","sentAt":"2009-10-01T23:04:14Z","receivedAt":"2009-10-01T23:04:14Z","isPatch":false,"sender":{"key":"jonsmirl@gmail.com","avatar":"https://gravatar.com/avatar/cff3bf5bfdfa6708b905712ff91f0f9b8aaca161659f38c02b787920d5d28b7e?d=mp&s=160"},"body":"I have 100 patches loaded into in stgit. My tree is at 2.6.30. Now I\nwant to rebase to 2.6.31-rc1. About 30 of these hundred patches got\ncommitted in this interval.\n\nIf I rebase directly to 2.6.31-rc1 I end up with a bunch of merge\nconflicts as the patches are applied. That's because patches 'a,b,c'\ngot applied in the merge window. When I push 'a' back down it sees the\ncombination of 'a,b,c' not just 'a'. It is unable to figure out that\n'a' was applied and then 'b' and 'c' applied on top of it.\n\nIs there a better way to locate the patches the got applied?\n\n-- \nJon Smirl\njonsmirl@gmail.com\n"},{"id":"298992","messageId":"9e4733910910040600g2cbd1deah6e7ae3ad9a4aa54e@mail.gmail.com","threadId":"21110","inReplyTo":"9e4733910910011604w68cdca86l2baa2f2fe4db4a32@mail.gmail.com","subject":"Re: stgit, rebasing with 100 patches","fromName":"Jon Smirl","fromEmail":"jonsmirl@gmail.com","sentAt":"2009-10-04T13:00:28Z","receivedAt":"2009-10-04T13:00:28Z","isPatch":false,"sender":{"key":"jonsmirl@gmail.com","avatar":"https://gravatar.com/avatar/cff3bf5bfdfa6708b905712ff91f0f9b8aaca161659f38c02b787920d5d28b7e?d=mp&s=160"},"body":"On Thu, Oct 1, 2009 at 7:04 PM, Jon Smirl <jonsmirl@gmail.com> wrote:\n> I have 100 patches loaded into in stgit. My tree is at 2.6.30. Now I\n> want to rebase to 2.6.31-rc1. About 30 of these hundred patches got\n> committed in this interval.\n>\n> If I rebase directly to 2.6.31-rc1 I end up with a bunch of merge\n> conflicts as the patches are applied. That's because patches 'a,b,c'\n> got applied in the merge window. When I push 'a' back down it sees the\n> combination of 'a,b,c' not just 'a'. It is unable to figure out that\n> 'a' was applied and then 'b' and 'c' applied on top of it.\n>\n> Is there a better way to locate the patches the got applied?\n\nA solution to this is to make an option on rebase that walks the patch\nstack forward one commit at a time.\n\nWhat does the --merged option do on stg rebase? The doc is rather sparse.\n\n\n-- \nJon Smirl\njonsmirl@gmail.com\n"},{"id":"126576","messageId":"b8197bcb0911020022k5fefa7f5ia0901af8df0a3604@mail.gmail.com","threadId":"21110","inReplyTo":"9e4733910910040600g2cbd1deah6e7ae3ad9a4aa54e@mail.gmail.com","subject":"Re: stgit, rebasing with 100 patches","fromName":"Karl Wiberg","fromEmail":"kha@treskal.com","sentAt":"2009-11-02T08:22:13Z","receivedAt":"2009-11-02T08:22:13Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On Sun, Oct 4, 2009 at 2:00 PM, Jon Smirl <jonsmirl@gmail.com> wrote:\n\n> On Thu, Oct 1, 2009 at 7:04 PM, Jon Smirl <jonsmirl@gmail.com> wrote:\n>\n> > Is there a better way to locate the patches the got applied?\n>\n> A solution to this is to make an option on rebase that walks the\n> patch stack forward one commit at a time.\n>\n> What does the --merged option do on stg rebase? The doc is rather\n> sparse.\n\nRight, -m/--merged is what you want. Before applying any of the\npatches, it tries to reverse-apply all of them in reverse\norder---successful applications mean the patch was already in\nupstream. It works surprisingly well.\n\n-- \nKarl Wiberg, kha@treskal.com\n   www.treskal.com/kalle\n"}]}