From: "Jon Smirl" <jonsmirl@gmail.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: stgit: lost all my patches again
Date: Thu, 4 Oct 2007 09:06:22 -0400 [thread overview]
Message-ID: <9e4733910710040606j75caa6bcn1e97e59c1285eb4b@mail.gmail.com> (raw)
In-Reply-To: <20071004083304.GB17778@diana.vm.bytemark.co.uk>
On 10/4/07, Karl Hasselström <kha@treskal.com> wrote:
> Mmmph. This is not the only StGit command that's apparently not safe
> to run from a subdirectory. See e.g. https://gna.org/bugs/?9986.
>
> I plan to do some StGit hacking this weekend. I guess subdirectory
> safeness ought to be at the top of my list ...
Isn't a rollback log fairly easy to implement? Is there a single SHA
after each operation? If so just record the commands and the sha to
rollback.
I have also messed things up more than once using 'git merge linus'
instead of 'stg rebase linus'. Should 'git merge' have a check to see
if stg is active and refuse to run?
--
Jon Smirl
jonsmirl@gmail.com
next prev parent reply other threads:[~2007-10-04 13:06 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-04 5:29 stgit: lost all my patches again Jon Smirl
2007-10-04 8:33 ` Karl Hasselström
2007-10-04 12:10 ` Jon Smirl
2007-10-04 13:06 ` Jon Smirl [this message]
2007-10-04 15:38 ` Karl Hasselström
2007-10-04 15:45 ` David Brown
2007-10-04 17:29 ` Karl Hasselström
-- strict thread matches above, loose matches on Subject: below --
2007-11-27 22:17 Jon Smirl
2007-11-27 22:24 ` Jakub Narebski
2007-11-27 23:12 ` Jon Smirl
2007-11-28 9:34 ` Karl Hasselström
2007-11-28 15:06 ` Jon Smirl
2007-11-28 16:04 ` Karl Hasselström
2007-11-28 16:21 ` Jon Smirl
2007-11-28 16:41 ` Karl Hasselström
2007-11-28 16:58 ` Jon Smirl
2007-11-28 17:19 ` Karl Hasselström
2007-11-28 0:37 ` Junio C Hamano
2007-11-28 2:59 ` Jon Smirl
2007-11-28 6:32 ` Karl Hasselström
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=9e4733910710040606j75caa6bcn1e97e59c1285eb4b@mail.gmail.com \
--to=jonsmirl@gmail.com \
--cc=git@vger.kernel.org \
--cc=kha@treskal.com \
/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).