cg switch -l doesn't work when branches point to the same commit

cg switch -l doesn't work when branches point to the same commit

[Bradford Smith]

The message below applies to software versions:

git version 1.4.4.2
cogito-0.18.2

Why doesn't cg switch -l save local changes when you switch to a
branch that points at the same commit you're already on?  Here's the
case I ran into.

1. On my master branch I was part of the way through making a fairly
complex change when I discovered an unrelated bug.  So, I wanted to:
     a. move my partial changes to a topical branch
     b. fix the bug on master
     c. finish my changes on the topical branch
     d. merge the topical branch back into master

2. I didn't really want to _commit_ my partial changes yet, though,
because I was really in mid-thought there, so I wanted to do it this
way:

# create the topical branch, carrying my local changes along with me
cg switch -c topical-branch
# switch back to master, leaving my local changes with the topical branch
cg switch -l master
# fix bug on master then
cg commit
# switch back to topical branch
cg switch topical-branch
# continue with changes and eventually
cg commit
cg switch master
cg merge topical-branch

Unfortunately, I found that 'cg switch -l master' did NOT save my
local changes.  I had to switch back to the branch, commit my partial
changes, then back to master to fix the bug.  So, I was able to work
around this, but I still found the behavior surprising.  If this is
expected behavior, shouldn't it be documented in the cg-switch man
page?

BTW, in a test repository/working directory I was able to confirm that
cg switch -l worked as documented when the two branches involved
pointed to different commits.

Thanks,

Bradford C. Smith

Re: cg switch -l doesn't work when branches point to the same commit

[Alex Riesen]

On 7/11/07, Bradford Smith <bradford.carl.smith@gmail.com> wrote:
> The message below applies to software versions:
>
> git version 1.4.4.2

It is fixed sometime between your version and git-1.5.2.2.
Use git checkout.

> cogito-0.18.2

Cogito is unmaintained ATM.

Re: cg switch -l doesn't work when branches point to the same commit

[Sean]

On Wed, 11 Jul 2007 15:36:39 +0200
"Alex Riesen" <raa.lkml@gmail.com> wrote:

> Cogito is unmaintained ATM.

Wonder who maintains the http://git.kernel.org site?  The front page
there still suggests the use of Cogito.

Sean

Re: cg switch -l doesn't work when branches point to the same commit

[Bill Lear]

On Wednesday, July 11, 2007 at 16:34:46 (-0400) Sean writes:
>On Wed, 11 Jul 2007 15:36:39 +0200
>"Alex Riesen" <raa.lkml@gmail.com> wrote:
>
>> Cogito is unmaintained ATM.
>
>Wonder who maintains the http://git.kernel.org site?  The front page
>there still suggests the use of Cogito.

Petr Baudis, CCd here.


Bill