stgit: deleting a branch doesn't seem to work

stgit: deleting a branch doesn't seem to work

[Torgil Svensson]

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?

//Torgil

Re: stgit: deleting a branch doesn't seem to work

[Catalin Marinas]

"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

Re: stgit: deleting a branch doesn't seem to work

[Torgil Svensson]

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
>

Re: stgit: deleting a branch doesn't seem to work

[Catalin Marinas]

On 22/08/06, Torgil Svensson <torgil.svensson@gmail.com> wrote:
> 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).

You could also use git-apply which understands the output of
format-patch and change the commits into StGIT patches with "stg
uncommit" (use the latest stgit snapshot as it has some bug-fixes and
can automatically generate the patch name from the commit subject
line).

The tutorial is pretty old and doesn't cover all the commands and options.

-- 
Catalin