From: "Torgil Svensson" <torgil.svensson@gmail.com>
To: "Catalin Marinas" <catalin.marinas@gmail.com>, git@vger.kernel.org
Subject: Re: stgit: deleting a branch doesn't seem to work
Date: Tue, 22 Aug 2006 19:12:53 +0200 [thread overview]
Message-ID: <e7bda7770608221012u269ca577ye83a3a548c4faf08@mail.gmail.com> (raw)
In-Reply-To: <tnxd5attbhq.fsf@arm.com>
Which option you choose doesn't really matter to me, I easily deleted
the master-branch (with rm). If you choose to stay with the current
situation the message should be changed to something like "stgit
patches succesfully deleted from branch xxx" and "branch xxx is not
controlled by stgit, nothing is done."
It also would be helpful to new users if "stg refresh -e" is mentioned
in the tutorial. Refresh isn't obvious to test if you want to edit
description.
Otherwise I had no problem in my first stgit experience. I first took
a chance that "stgit import" recognized patches saved by
"format-patch", but this was easily solved with "stg refresh -e" once
I found it (thanks #git).
I've never worked with quilt before so i'm new to this style of
development. My experiece so far is that I find stgit to be very
useful. Thanks!
//Torgil
On 8/22/06, Catalin Marinas <catalin.marinas@arm.com> wrote:
> "Torgil Svensson" <torgil.svensson@gmail.com> wrote:
> > I have three branches and want my "gst10" to be "master" instead
> >
> > $ stg branch --delete master
> > Deleting branch "master"... done
> > $ stg branch -l
> > Available branches:
> > s gst10 |
> > master |
> >> origin |
> > $ stg branch --delete master
> > Deleting branch "master"... done
> > $ stg branch -r gst10 master
> > stg branch: Branch "master" already exists
> >
> > Is there something i'm missing in my logic?
>
> It's not actually documented but it looks like the master branch is
> not completely deleted by StGIT. If you have StGIT-managed patches in
> "master", they are removed but the GIT branch is kept as this is
> usually the default branch.
>
> You could do a "git branch -d master" but maybe I should change StGIT
> to fully delete the "master" branch as well.
>
> --
> Catalin
>
next prev parent reply other threads:[~2006-08-22 17:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-21 17:27 stgit: deleting a branch doesn't seem to work Torgil Svensson
2006-08-22 8:34 ` Catalin Marinas
2006-08-22 17:12 ` Torgil Svensson [this message]
2006-08-23 9:15 ` Catalin Marinas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e7bda7770608221012u269ca577ye83a3a548c4faf08@mail.gmail.com \
--to=torgil.svensson@gmail.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).