From: Auke Kok <auke-jan.h.kok@intel.com>
To: git@vger.kernel.org
Subject: stg pop/push -a nitpick: not handling deleted files
Date: Fri, 15 Sep 2006 10:19:40 -0700 [thread overview]
Message-ID: <450AE0AC.7060806@intel.com> (raw)
Hi,
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.
I'm not sure what the resolution of this would be, but this problem could very
well be anticipated (after all I just pushed/imported a patch removing the file
to the stack).
Cheers,
Auke
$ 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?)
next reply other threads:[~2006-09-15 17:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-15 17:19 Auke Kok [this message]
2006-09-15 21:41 ` stg pop/push -a nitpick: not handling deleted files Catalin Marinas
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=450AE0AC.7060806@intel.com \
--to=auke-jan.h.kok@intel.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).