{"thread":{"id":"1184","subject":"Stacked GIT 0.4","startedAt":"2005-07-09T09:05:39Z","lastAt":"2005-07-27T21:26:18Z","messageCount":5,"participants":["Catalin Marinas","Bryan Larsen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"5853","messageId":"1120899939.7125.4.camel@localhost.localdomain","threadId":"1184","inReplyTo":null,"subject":"Stacked GIT 0.4","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2005-07-09T09:05:39Z","receivedAt":"2005-07-09T09:05:39Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"Stacked GIT 0.4 release is available from http://procode.org/stgit/\n\nStGIT is a Python application providing similar functionality to Quilt\n(i.e. pushing/popping patches to/from a stack) on top of GIT. These\noperations are performed using GIT commands and the patches are stored\nas GIT commit objects, allowing easy merging of the StGIT patches into\nother repositories using standard GIT functionality.\n\nNote that StGIT is not an SCM interface on top of GIT and it expects a\npreviously initialised GIT repository. For standard SCM operations,\neither use plain GIT commands or the Cogito tool.\n\nFor more information, see the README file in the archive.\n\nWhat's new in this release:\n\n * Support for configuration files (/etc/stgitrc,\n ~/.stgitrc, .git/stgitrc)\n * Configurable merge tool ('diff3' by default)\n * Empty patches are marked with a '0' when listed with\n 'series' (useful for tracking upstream merges)\n * Support for patch description templates (with variables like\n author details and diffstats)\n * 'files' command to show the files modified by a patch (either a\n simple list or with diffstats)\n * 'push --undo' option to cancel a push operation\n * 'push/pop --to' option to perform the operation on a range of\n patches between the given names\n * 'push --reverse' option to push patches in reverse order\n * 'diff --stat' option to show the diffstats instead of the diff\n * Faster 'pop' - it now switches directly to the bottom of the\n last patch to be popped\n * The three files involved in a three-way merge are left in the\n working tree in case of a conflict for further analysis (can be\n overwritten with the 'keeporig' option)\n * Many bug fixes\n\n--\nCatalin\n"},{"id":"6030","messageId":"42D3A415.5000709@gmail.com","threadId":"1184","inReplyTo":"1120899939.7125.4.camel@localhost.localdomain","subject":"Re: Stacked GIT 0.4","fromName":"Bryan Larsen","fromEmail":"bryan.larsen@gmail.com","sentAt":"2005-07-12T11:05:57Z","receivedAt":"2005-07-12T11:05:57Z","isPatch":false,"sender":{"key":"bryan@larsen.st","avatar":"https://avatars.githubusercontent.com/u/32073?v=4"},"body":"Catalin Marinas wrote:\n> Stacked GIT 0.4 release is available from http://procode.org/stgit/\n> \n\nVery nice.\n\nHere's my wishlist. Hopefully I'll be able to dig in and help out.\n\nimport: the complement to export\ntemplate files for the \"series\" output of export, to put it into a \nformat that \"sendpatchset\" understands.\n\nBryan\n"},{"id":"6032","messageId":"tnxfyukjhdn.fsf@arm.com","threadId":"1184","inReplyTo":"42D3A415.5000709@gmail.com","subject":"Re: Stacked GIT 0.4","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2005-07-12T13:14:44Z","receivedAt":"2005-07-12T13:14:44Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"Bryan Larsen wrote:\n> import: the complement to export\n\nIt is written in the TODO file but didn't have time to do it. I'm\nworking on moving all the commands from main.py into separate files\nunder stgit/commands/ for a clearer view. This should be ready in the\nnext day or two and, after that, I will work on other commands.\n\n> template files for the \"series\" output of export, to put it into a\n> format that \"sendpatchset\" understands.\n\nI thought about integrating sendpatchset into stgit but it is much\nsimpler to just generate a control file (especially if you want to\nreview what you're going to send). Is the subject line always the\nfirst line of the patch description?\n\n-- \nCatalin\n"},{"id":"6033","messageId":"42D3C5C6.9060609@gmail.com","threadId":"1184","inReplyTo":"tnxfyukjhdn.fsf@arm.com","subject":"Re: Stacked GIT 0.4","fromName":"Bryan Larsen","fromEmail":"bryan.larsen@gmail.com","sentAt":"2005-07-12T13:29:42Z","receivedAt":"2005-07-12T13:29:42Z","isPatch":false,"sender":{"key":"bryan@larsen.st","avatar":"https://avatars.githubusercontent.com/u/32073?v=4"},"body":"Catalin Marinas wrote:\n> Bryan Larsen wrote:\n>>template files for the \"series\" output of export, to put it into a\n>>format that \"sendpatchset\" understands.\n> \n> \n> I thought about integrating sendpatchset into stgit but it is much\n> simpler to just generate a control file (especially if you want to\n> review what you're going to send). Is the subject line always the\n> first line of the patch description?\n> \n\nI haven't been using \"the Linux way\" for long, so I'm probably the wrong \nguy to answer, but for my current set of patches, the name of the patch \nwould be the right thing to put in the Subject line.\n\nBut my current set of patches is really small, so if you implemented the \n\"first line\" convention, I'd be happy to switch to it.\n\nBryan\n"},{"id":"6487","messageId":"1122499578.8047.4.camel@localhost.localdomain","threadId":"1184","inReplyTo":"42D3A415.5000709@gmail.com","subject":"Re: Stacked GIT 0.4","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2005-07-27T21:26:18Z","receivedAt":"2005-07-27T21:26:18Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On Tue, 2005-07-12 at 07:05 -0400, Bryan Larsen wrote:\n> Here's my wishlist. Hopefully I'll be able to dig in and help out.\n> \n> import: the complement to export\n\nA first implementation of 'import' is available in the tonight's\nsnapshot (and in the StGIT git repository mirror).\n\n> template files for the \"series\" output of export, to put it into a \n> format that \"sendpatchset\" understands.\n\nAs you noticed, I implemented the 'mail' command.\n\nOnce the current snapshot gets a bit more testing, I will release the\n0.5 version. After that, I will focus more on a tutorial and the file\ncompatibility with Cogito.\n\n-- \nCatalin\n"}]}