From: Jon Smirl Date: Thu, 04 Oct 2007 13:06:22 GMT Subject: Re: stgit: lost all my patches again Message-ID: <9e4733910710040606j75caa6bcn1e97e59c1285eb4b@mail.gmail.com> In-Reply-To: <20071004083304.GB17778@diana.vm.bytemark.co.uk> On 10/4/07, Karl Hasselström 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