{"thread":{"id":"35260","subject":"[ANNOUNCE] git reintegrate 0.1; manager of integration branches","startedAt":"2013-11-01T12:35:39Z","lastAt":"2013-11-02T11:18:35Z","messageCount":3,"participants":["Felipe Contreras","John Keeping"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"230002","messageId":"CAMP44s2cuHnW0cGEBRt2EmG8Wmav4athMLXRCh2cJ2KymeHmmg@mail.gmail.com","threadId":"35260","inReplyTo":null,"subject":"[ANNOUNCE] git reintegrate 0.1; manager of integration branches","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-11-01T12:35:39Z","receivedAt":"2013-11-01T12:35:39Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Hi,\n\ngit reintegrate is a helper tool to manage integration branches, it\nhas all the options of other known tools.\n\nThis is a rewrite of John Keeping's git-integration in Ruby, it has\nessentially the same features and passes all the git-integration\ntests, but it has other features.\n\nOne feature that is missing from git-integration is the ability to\nparse existing integration branches.\n\nTo give a try you can do:\n\n  git clone https://github.com/gitster/git/\n  cd git\n  git fetch -u origin 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'\n  git checkout pu\n  git reintegrate --generate pu master\n\nWhich will generate the integration instructions for you:\n\n  % git reintegrate --cat\n  base master\n  merge jl/submodule-mv\n\n    Moving a regular file in a repository with a .gitmodules file was\n    producing a warning 'Could not find section in .gitmodules where\n    path=<filename>'.\n\n  merge ap/remote-hg-unquote-cquote\n\n    A fast-import stream expresses a pathname with funny characters by\n    quoting them in C style; remote-hg remote helper forgot to unquote\n    such a path.\n\n  merge jk/for-each-ref-skip-parsing\n  merge jk/pack-corruption-post-mortem\n  merge jk/reset-p-current-head-fix\n\n    \"git reset -p HEAD\" has codepath to special case it from resetting\n    to contents of other commits, but recent change broke it.\n\n  ...\n\nIt also has support for \"evil merges\", so it should be perfectly\nusable for git.git maintenance.\n\nYou can edit the instructions with `git reintegrate --edit`.\n\nThe simplest way to begin an integration branch is with:\n\n  git reintegrate --create pu master\n  git reintegrate --add=branch1 --add=branch2 --add=branch3\n\nTo generate the integration branch run `git reintegrate --rebuild`, if\nthere are merge conflicts, solve them and continue with `git\nreintegrate --continue`.\n\nDespite having more features, the code is actually smaller thanks to\nRuby awesomeness.\n\nEnjoy.\n\nhttps://github.com/felipec/git-reintegrate\n\n-- \nFelipe Contreras\n"},{"id":"230033","messageId":"20131102110028.GD24023@serenity.lan","threadId":"35260","inReplyTo":"CAMP44s2cuHnW0cGEBRt2EmG8Wmav4athMLXRCh2cJ2KymeHmmg@mail.gmail.com","subject":"Re: [ANNOUNCE] git reintegrate 0.1; manager of integration branches","fromName":"John Keeping","fromEmail":"john@keeping.me.uk","sentAt":"2013-11-02T11:00:28Z","receivedAt":"2013-11-02T11:00:28Z","isPatch":false,"sender":{"key":"john@keeping.me.uk","avatar":"https://avatars.githubusercontent.com/u/1702081?v=4"},"body":"On Fri, Nov 01, 2013 at 06:35:39AM -0600, Felipe Contreras wrote:\n> One feature that is missing from git-integration is the ability to\n> parse existing integration branches.\n\nNice - I'd never thought of doing this.\n\n> It also has support for \"evil merges\", so it should be perfectly\n> usable for git.git maintenance.\n\nBy this, do you mean that you have an ability to squash a fixup into the\nmerge?  If so, how do you handle this in the status display - I've had a\nWIP branch for a while but haven't come up with a satisfactory way of\ndisplaying the status of a fixup.\n"},{"id":"230034","messageId":"CAMP44s2pydOZOdHEzDOm+57LbiFr-QgAE_3Xk6QfpDULMAs9xQ@mail.gmail.com","threadId":"35260","inReplyTo":"20131102110028.GD24023@serenity.lan","subject":"Re: [ANNOUNCE] git reintegrate 0.1; manager of integration branches","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-11-02T11:18:35Z","receivedAt":"2013-11-02T11:18:35Z","isPatch":false,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"On Sat, Nov 2, 2013 at 5:00 AM, John Keeping <john@keeping.me.uk> wrote:\n> On Fri, Nov 01, 2013 at 06:35:39AM -0600, Felipe Contreras wrote:\n>> One feature that is missing from git-integration is the ability to\n>> parse existing integration branches.\n>\n> Nice - I'd never thought of doing this.\n\nI tried to provide all the functionality of todo:Reintegrate, or at\nleast the important one.\n\n>> It also has support for \"evil merges\", so it should be perfectly\n>> usable for git.git maintenance.\n>\n> By this, do you mean that you have an ability to squash a fixup into the\n> merge?  If so, how do you handle this in the status display - I've had a\n> WIP branch for a while but haven't come up with a satisfactory way of\n> displaying the status of a fixup.\n\nYes, I did basically what you did, however, I skipped the status part.\nI think it's more important to be able to do these fixups, even if\nthey don't show on the status.\n\nAnd to be honest I don't care much about the status feature in general.\n\nCheers.\n\n-- \nFelipe Contreras\n"}]}