From: David Kågedal <davidk@lysator.liu.se>
Date: Mon, 07 Jan 2008 23:11:57 GMT
Subject: Re: StGIT loses Git commit using "stg repair"; I miss "stg assimilate"
Message-ID: <873at9z0w2.fsf@lysator.liu.se>
In-Reply-To: <200801072345.21585.jnareb@gmail.com>

Jakub Narebski <jnareb@gmail.com> writes:

> I have StGIT branch with no patches applied: all patches are on stack.
> I have accidentally added git commit on top of StGIT branch head.
> I tried to use "stg assimilate" to turn this commit into StGIT commit, 
> applied, but new version of StGIT has only "stg repair". And the 
> sequence

If you have no patches, there is nothing to assimilate or repair. Your
patch stack is considered to be on top of your new commit, so if you
push a patch it will appear on top of the commit you just created.

To turn your new commit into a patch, use "stg uncommit".

>  # stg repair
>  # stg rebase origin
>
> made me lose this git commit (well, up to reflog of course). This should 
> not happen! Why assimilate got removed?

repair does exactly what assimilate did in this case, so it would not
have helped you.

-- 
David Kågedal