* stgit: No patches to pop
@ 2006-12-11 14:32 Bahadir Balban
2006-12-11 16:11 ` Catalin Marinas
0 siblings, 1 reply; 6+ messages in thread
From: Bahadir Balban @ 2006-12-11 14:32 UTC (permalink / raw)
To: git
Hi,
I've just recently started using stgit (v0.11, git v1.4.3.4). On a
test repository, I do:
% stg applied
first
second
third
but when I pop I get:
% stg pop
stg pop: No patches to pop
I also get things like:
% stg pop second
popping patch "third"... done
Now at patch "second"
Is this normal?
Thanks,
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: stgit: No patches to pop
2006-12-11 14:32 stgit: No patches to pop Bahadir Balban
@ 2006-12-11 16:11 ` Catalin Marinas
2006-12-11 16:20 ` Jakub Narebski
0 siblings, 1 reply; 6+ messages in thread
From: Catalin Marinas @ 2006-12-11 16:11 UTC (permalink / raw)
To: Bahadir Balban; +Cc: git
"Bahadir Balban" <bahadir.balban@gmail.com> wrote:
> I've just recently started using stgit (v0.11, git v1.4.3.4). On a
> test repository, I do:
>
> % stg applied
> first
> second
> third
>
> but when I pop I get:
>
> % stg pop
> stg pop: No patches to pop
Can you write a list of commands or script so that I can easily
reproduce this? It works OK for me.
> I also get things like:
>
> % stg pop second
> popping patch "third"... done
> Now at patch "second"
In version 0.11, the "pop" command is equivalent to "goto". I changed
this in the latest version (in the StGIT repository) so that "pop
<patch>" tries to only extract that patch from the stack by popping
all the patches to the given one and pushing them back without the one
you specified. It also supports patch ranges (i.e. patch1..patch4).
--
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: stgit: No patches to pop
2006-12-11 16:11 ` Catalin Marinas
@ 2006-12-11 16:20 ` Jakub Narebski
2006-12-11 17:05 ` Bahadir Balban
[not found] ` <b0943d9e0612111426s3e0c671eqca31558e47d4348b@mail.gmail.com>
0 siblings, 2 replies; 6+ messages in thread
From: Jakub Narebski @ 2006-12-11 16:20 UTC (permalink / raw)
To: git
Catalin Marinas wrote:
>> I also get things like:
>>
>> % stg pop second
>> popping patch "third"... done
>> Now at patch "second"
>
> In version 0.11, the "pop" command is equivalent to "goto". I changed
> this in the latest version (in the StGIT repository) so that "pop
> <patch>" tries to only extract that patch from the stack by popping
> all the patches to the given one and pushing them back without the one
> you specified. It also supports patch ranges (i.e. patch1..patch4).
That is kind of strange. Pop should work like pop does, for example
the one in Perl or Python, removing n elements from the stack of applied
patches. Not work as "float <patch>"...
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: stgit: No patches to pop
2006-12-11 16:20 ` Jakub Narebski
@ 2006-12-11 17:05 ` Bahadir Balban
2006-12-12 9:10 ` Catalin Marinas
[not found] ` <b0943d9e0612111426s3e0c671eqca31558e47d4348b@mail.gmail.com>
1 sibling, 1 reply; 6+ messages in thread
From: Bahadir Balban @ 2006-12-11 17:05 UTC (permalink / raw)
To: Jakub Narebski; +Cc: git
On 12/11/06, Jakub Narebski <jnareb@gmail.com> wrote:
> That is kind of strange. Pop should work like pop does, for example
> the one in Perl or Python, removing n elements from the stack of applied
> patches. Not work as "float <patch>"...
> --
> Jakub Narebski
> Warsaw, Poland
> ShadeHawk on #git
As a new user my first expectation was as Catalin has revised. If it's
going to stay as in 0.11 at least it would be nice to have it
described in the wiki.
Thanks,
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: stgit: No patches to pop
[not found] ` <b0943d9e0612111426s3e0c671eqca31558e47d4348b@mail.gmail.com>
@ 2006-12-11 22:54 ` Jakub Narebski
0 siblings, 0 replies; 6+ messages in thread
From: Jakub Narebski @ 2006-12-11 22:54 UTC (permalink / raw)
To: Catalin Marinas; +Cc: git
Catalin Marinas wrote:
> On 11/12/06, Jakub Narebski <jnareb@gmail.com> wrote:
>> Catalin Marinas wrote:
>>
>>>> I also get things like:
>>>>
>>>> % stg pop second
>>>> popping patch "third"... done
>>>> Now at patch "second"
>>>
>>> In version 0.11, the "pop" command is equivalent to "goto". I changed
>>> this in the latest version (in the StGIT repository) so that "pop
>>> <patch>" tries to only extract that patch from the stack by popping
>>> all the patches to the given one and pushing them back without the one
>>> you specified. It also supports patch ranges (i.e. patch1..patch4).
>>
>> That is kind of strange. Pop should work like pop does, for example
>> the one in Perl or Python, removing n elements from the stack of applied
>> patches. Not work as "float <patch>"...
>
> Probably I wasn't clear enough. The "pop" operations are as follows:
>
> 1. "stg pop" only removes the top patch from the applied patches
> 2. "stg pop <patch>.." is equivalent to popping all patches to <patch>
> (including the latter)
> 3. "stg pop <patch>" is equivalent to "stg float <patch>; stg pop".
> 4. "stg pop <patch list or range>" is equivalent to "stg float <patch
> list or range>; stg pop <all the patches in the list or range>"
>
> These feature was Yann's idea and I find it to be more in line with
> the "push" command.
Nice, and easy to understand. By the way, the same works with "stg push",
doesn't it?
--
Jakub Narebski
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: stgit: No patches to pop
2006-12-11 17:05 ` Bahadir Balban
@ 2006-12-12 9:10 ` Catalin Marinas
0 siblings, 0 replies; 6+ messages in thread
From: Catalin Marinas @ 2006-12-12 9:10 UTC (permalink / raw)
To: Bahadir Balban; +Cc: Jakub Narebski, git
"Bahadir Balban" <bahadir.balban@gmail.com> wrote:
> On 12/11/06, Jakub Narebski <jnareb@gmail.com> wrote:
>> That is kind of strange. Pop should work like pop does, for example
>> the one in Perl or Python, removing n elements from the stack of applied
>> patches. Not work as "float <patch>"...
>> --
>> Jakub Narebski
>> Warsaw, Poland
>> ShadeHawk on #git
>
> As a new user my first expectation was as Catalin has revised. If it's
> going to stay as in 0.11 at least it would be nice to have it
> described in the wiki.
It was already modified in the StGIT repository and I am won't revert
it to the 0.11 functionality. Please feel free to modify the wiki
(which is really out of date - "stg help <command>" has more
up-to-date information).
--
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2006-12-12 9:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-12-11 14:32 stgit: No patches to pop Bahadir Balban
2006-12-11 16:11 ` Catalin Marinas
2006-12-11 16:20 ` Jakub Narebski
2006-12-11 17:05 ` Bahadir Balban
2006-12-12 9:10 ` Catalin Marinas
[not found] ` <b0943d9e0612111426s3e0c671eqca31558e47d4348b@mail.gmail.com>
2006-12-11 22:54 ` Jakub Narebski
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).