{"thread":{"id":"12993","subject":"rebase--interactive in C vs. sequencer","startedAt":"2008-04-05T12:22:30Z","lastAt":"2008-04-06T21:44:54Z","messageCount":2,"participants":["Stephan Beyer","Daniel Barkalow"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"73695","messageId":"20080405122230.GC14565@leksak.fem-net","threadId":"12993","inReplyTo":null,"subject":"rebase--interactive in C vs. sequencer","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-04-05T12:22:30Z","receivedAt":"2008-04-05T12:22:30Z","isPatch":false,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"Hi Daniel,\n\nin [1] you have told that you are working on porting rebase--interactive\nto the C programming language.  In reply, Junio pointed out that a\nconsolidated \"git sequencer\" is desired.\n\nThe sequencer became a project idea for Google Summer of Code and I am\ncurrently applying for that project.  But I had your mail in mind and \ndo not want that any work of yours is thrown away. ;-)\nSo... what is the current state?\nAre you still working on it?\nIs there a code stub or even more code which could be used for the\nsequencer task?\n\nRegards,\n Stephan\n\nReferences:\n 1. http://marc.info/?l=git&m=120327576215702\n\n-- \nStephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F\n"},{"id":"73781","messageId":"alpine.LNX.1.00.0804061724210.19665@iabervon.org","threadId":"12993","inReplyTo":"20080405122230.GC14565@leksak.fem-net","subject":"Re: rebase--interactive in C vs. sequencer","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2008-04-06T21:44:54Z","receivedAt":"2008-04-06T21:44:54Z","isPatch":false,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Sat, 5 Apr 2008, Stephan Beyer wrote:\n\n> Hi Daniel,\n> \n> in [1] you have told that you are working on porting rebase--interactive\n> to the C programming language.  In reply, Junio pointed out that a\n> consolidated \"git sequencer\" is desired.\n> \n> The sequencer became a project idea for Google Summer of Code and I am\n> currently applying for that project.  But I had your mail in mind and \n> do not want that any work of yours is thrown away. ;-)\n\nIt's at git://iabervon.org/~barkalow/git/ builtin-rebase-int\n\n> So... what is the current state?\n\nI was mainly working from rebase--interactive, and a lot of what I have is \nthe code for the particular steps that uses.\n\n> Are you still working on it?\n\nNot at the moment. I've been busy with a new job recently, and my git work \nhas mainly been on builtin-clone.\n\n> Is there a code stub or even more code which could be used for the\n> sequencer task?\n\nI haven't actually looked at it recently, so I don't entirely remember how \nfar I got. I think my most recent code is based around the idea of having \na sequence file and a file of saved options, but it's just kind of a \nsketch and most of the stuff isn't actually implemented. IIRC, the last \nthing I ran into was trying to decide where to leave the line for the step \nin progress. I think I'd settled on a set of operations that a step should \ndefine:\n\n a) try doing the step, which either works and you go to (c), or it \n    requires user assistance and you exit now and later start at (b)\n b) apply the stuff the user did to help\n c) finish up anything common\n\nFor example, merging would be:\n\n a) try an automatic merge; if it works, succeed, otherwise, write out \n    conflict files and exit\n b) check that the index is merged\n c) make a merge commit\n\nIIRC, for some operations (b) was more interesting, because the case that \ndidn't have user assistence generates the final state differently and \nthere's less in (c).\n\n\t-Daniel\n*This .sig left intentionally blank*\n"}]}