{"thread":{"id":"11727","subject":"stgit: premerge hooks and preventing errors","startedAt":"2008-01-24T20:32:40Z","lastAt":"2008-01-25T08:43:28Z","messageCount":2,"participants":["Jon Smirl","Karl Hasselström"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"66517","messageId":"9e4733910801241232j58974193i5ec0a618376c2415@mail.gmail.com","threadId":"11727","inReplyTo":null,"subject":"stgit: premerge hooks and preventing errors","fromName":"Jon Smirl","fromEmail":"jonsmirl@gmail.com","sentAt":"2008-01-24T20:32:40Z","receivedAt":"2008-01-24T20:32:40Z","isPatch":false,"sender":{"key":"jonsmirl@gmail.com","avatar":"https://gravatar.com/avatar/cff3bf5bfdfa6708b905712ff91f0f9b8aaca161659f38c02b787920d5d28b7e?d=mp&s=160"},"body":"What's the status of using premerge hooks to stop git merge/pull from\nmessing up stgit? I just messed up another stgit tree by doing git\npull on it. I've learned how to fix this by rolling back the head, but\nthis mistake is way too easy to make.\n\nEven though I'm aware that this mistake is possible and I'm still\nmaking it. When you have a mix of git and stgit trees it is very easy\nto forget which one you are on.\n\n-- \nJon Smirl\njonsmirl@gmail.com\n"},{"id":"66548","messageId":"20080125084328.GB5804@diana.vm.bytemark.co.uk","threadId":"11727","inReplyTo":"9e4733910801241232j58974193i5ec0a618376c2415@mail.gmail.com","subject":"Re: stgit: premerge hooks and preventing errors","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2008-01-25T08:43:28Z","receivedAt":"2008-01-25T08:43:28Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2008-01-24 15:32:40 -0500, Jon Smirl wrote:\n\n> What's the status of using premerge hooks to stop git merge/pull\n> from messing up stgit? I just messed up another stgit tree by doing\n> git pull on it. I've learned how to fix this by rolling back the\n> head, but this mistake is way too easy to make.\n\nI decided that while such hooks would be useful, it'd be even more\nuseful to have \"stg undo\" which could undo every kind of mistake,\nincluding this one -- so I decided to build \"stg undo\" first. And I\nstill haven't quite started. :-) I do have the design more or less\nfinished, though.\n\n> Even though I'm aware that this mistake is possible and I'm still\n> making it. When you have a mix of git and stgit trees it is very\n> easy to forget which one you are on.\n\nVery true.\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"}]}