From: Catalin Marinas <catalin.marinas@arm.com>
To: Auke Kok <auke-jan.h.kok@intel.com>
Cc: git@vger.kernel.org
Subject: Re: stg pop/push -a nitpick: not handling deleted files
Date: Fri, 15 Sep 2006 22:41:09 +0100 [thread overview]
Message-ID: <tnxzmd03j0q.fsf@arm.com> (raw)
In-Reply-To: <450AE0AC.7060806@intel.com> (Auke Kok's message of "Fri, 15 Sep 2006 10:19:40 -0700")
Auke Kok <auke-jan.h.kok@intel.com> wrote:
> minor nitpick when working with a patch that deletes a file: stg does
> not handle the 'abandoned' file when popping all patches off -
> essentially it would have to put the file back over an abandoned file.
[...]
> $ stg pop -a
> Popping "all_git_versions.patch" - "all_copyright_update.patch"
> patches...fatal: Untracked working tree file
> 'drivers/net/e1000/LICENSE' would be overwritten by merge.
> stg pop: git-read-tree failed (local changes maybe?)
I don't think it's an StGIT-specific issue, git-read-tree failed to
switch the working tree from one commit to another because a file
would be overwritten. It is probably safer to fail in this situation.
--
Catalin
prev parent reply other threads:[~2006-09-15 21:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-15 17:19 stg pop/push -a nitpick: not handling deleted files Auke Kok
2006-09-15 21:41 ` Catalin Marinas [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=tnxzmd03j0q.fsf@arm.com \
--to=catalin.marinas@arm.com \
--cc=auke-jan.h.kok@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.