{"thread":{"id":"5343","subject":"stgit: deleting a branch doesn't seem to work","startedAt":"2006-08-21T17:27:02Z","lastAt":"2006-08-23T09:15:00Z","messageCount":4,"participants":["Torgil Svensson","Catalin Marinas"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"25697","messageId":"e7bda7770608211027m298ca361pdd78e164b9a524a5@mail.gmail.com","threadId":"5343","inReplyTo":null,"subject":"stgit: deleting a branch doesn't seem to work","fromName":"Torgil Svensson","fromEmail":"torgil.svensson@gmail.com","sentAt":"2006-08-21T17:27:02Z","receivedAt":"2006-08-21T17:27:02Z","isPatch":false,"sender":{"key":"torgil.svensson@gmail.com","avatar":null},"body":"I have three branches and want my \"gst10\" to be \"master\" instead\n\n$ stg branch --delete master\nDeleting branch \"master\"... done\n$ stg branch -l\nAvailable branches:\n s gst10 |\n master |\n> origin |\n$ stg branch --delete master\nDeleting branch \"master\"... done\n$ stg branch -r gst10 master\nstg branch: Branch \"master\" already exists\n\nIs there something i'm missing in my logic?\n\n//Torgil\n"},{"id":"25732","messageId":"tnxd5attbhq.fsf@arm.com","threadId":"5343","inReplyTo":"e7bda7770608211027m298ca361pdd78e164b9a524a5@mail.gmail.com","subject":"Re: stgit: deleting a branch doesn't seem to work","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@arm.com","sentAt":"2006-08-22T08:34:25Z","receivedAt":"2006-08-22T08:34:25Z","isPatch":false,"sender":{"key":"catalin.marinas@arm.com","avatar":null},"body":"\"Torgil Svensson\" wrote:\n> I have three branches and want my \"gst10\" to be \"master\" instead\n>\n> $ stg branch --delete master\n> Deleting branch \"master\"... done\n> $ stg branch -l\n> Available branches:\n> s gst10 |\n> master |\n>> origin |\n> $ stg branch --delete master\n> Deleting branch \"master\"... done\n> $ stg branch -r gst10 master\n> stg branch: Branch \"master\" already exists\n>\n> Is there something i'm missing in my logic?\n\nIt's not actually documented but it looks like the master branch is\nnot completely deleted by StGIT. If you have StGIT-managed patches in\n\"master\", they are removed but the GIT branch is kept as this is\nusually the default branch.\n\nYou could do a \"git branch -d master\" but maybe I should change StGIT\nto fully delete the \"master\" branch as well.\n\n-- \nCatalin\n"},{"id":"25754","messageId":"e7bda7770608221012u269ca577ye83a3a548c4faf08@mail.gmail.com","threadId":"5343","inReplyTo":"tnxd5attbhq.fsf@arm.com","subject":"Re: stgit: deleting a branch doesn't seem to work","fromName":"Torgil Svensson","fromEmail":"torgil.svensson@gmail.com","sentAt":"2006-08-22T17:12:53Z","receivedAt":"2006-08-22T17:12:53Z","isPatch":false,"sender":{"key":"torgil.svensson@gmail.com","avatar":null},"body":"Which option you choose doesn't really matter to me, I easily deleted\nthe master-branch (with rm). If you choose to stay with the current\nsituation the message should be changed to something like \"stgit\npatches succesfully deleted from branch xxx\" and \"branch xxx is not\ncontrolled by stgit, nothing is done.\"\n\nIt also would be helpful to new users if \"stg refresh -e\" is mentioned\nin the tutorial. Refresh isn't obvious to test if you want to edit\ndescription.\n\nOtherwise I had no problem in my first stgit experience. I first took\na chance that \"stgit import\" recognized patches saved by\n\"format-patch\", but this was easily solved with \"stg refresh -e\" once\nI found it (thanks #git).\n\nI've never worked with quilt before so i'm new to this style of\ndevelopment. My experiece so far is that I find stgit to be very\nuseful. Thanks!\n\n//Torgil\n\nOn 8/22/06, Catalin Marinas wrote:\n> \"Torgil Svensson\" wrote:\n> > I have three branches and want my \"gst10\" to be \"master\" instead\n> >\n> > $ stg branch --delete master\n> > Deleting branch \"master\"... done\n> > $ stg branch -l\n> > Available branches:\n> > s gst10 |\n> > master |\n> >> origin |\n> > $ stg branch --delete master\n> > Deleting branch \"master\"... done\n> > $ stg branch -r gst10 master\n> > stg branch: Branch \"master\" already exists\n> >\n> > Is there something i'm missing in my logic?\n>\n> It's not actually documented but it looks like the master branch is\n> not completely deleted by StGIT. If you have StGIT-managed patches in\n> \"master\", they are removed but the GIT branch is kept as this is\n> usually the default branch.\n>\n> You could do a \"git branch -d master\" but maybe I should change StGIT\n> to fully delete the \"master\" branch as well.\n>\n> --\n> Catalin\n>\n"},{"id":"25793","messageId":"b0943d9e0608230215y17f398fcjad2c8edf6aabf1a@mail.gmail.com","threadId":"5343","inReplyTo":"e7bda7770608221012u269ca577ye83a3a548c4faf08@mail.gmail.com","subject":"Re: stgit: deleting a branch doesn't seem to work","fromName":"Catalin Marinas","fromEmail":"catalin.marinas@gmail.com","sentAt":"2006-08-23T09:15:00Z","receivedAt":"2006-08-23T09:15:00Z","isPatch":false,"sender":{"key":"catalin.marinas@gmail.com","avatar":null},"body":"On 22/08/06, Torgil Svensson wrote:\n> Otherwise I had no problem in my first stgit experience. I first took\n> a chance that \"stgit import\" recognized patches saved by\n> \"format-patch\", but this was easily solved with \"stg refresh -e\" once\n> I found it (thanks #git).\n\nYou could also use git-apply which understands the output of\nformat-patch and change the commits into StGIT patches with \"stg\nuncommit\" (use the latest stgit snapshot as it has some bug-fixes and\ncan automatically generate the patch name from the commit subject\nline).\n\nThe tutorial is pretty old and doesn't cover all the commands and options.\n\n-- \nCatalin\n"}]}