git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: "Catalin Marinas" <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: stgit: No patches to pop
Date: Mon, 11 Dec 2006 23:54:52 +0100	[thread overview]
Message-ID: <200612112354.53124.jnareb@gmail.com> (raw)
In-Reply-To: <b0943d9e0612111426s3e0c671eqca31558e47d4348b@mail.gmail.com>

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

      parent reply	other threads:[~2006-12-11 22:52 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]

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=200612112354.53124.jnareb@gmail.com \
    --to=jnareb@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).