From: Petr Baudis <pasky@suse.cz>
To: Pavel Roskin <proski@gnu.org>
Cc: git <git@vger.kernel.org>
Subject: Re: cg-restore - restoring modified files
Date: Fri, 29 Jul 2005 10:48:03 +0200 [thread overview]
Message-ID: <20050729084801.GK24895@pasky.ji.cz> (raw)
In-Reply-To: <1118799921.3890.45.camel@dv>
Umm. I just discovered a portion of mailing list I somehow completely
missed. :/ Sorry for the delayed replies.
Dear diary, on Wed, Jun 15, 2005 at 03:45:21AM CEST, I got a letter
where Pavel Roskin <proski@gnu.org> told me that...
> Hello!
Hi,
> I believe the documented behavior of cg-restore is inconsistent.
>
> "Restore given files to their original state. Without any parameters, it
> recovers any files removed locally whose removal was not recorded by
> `cg-rm`."
>
> I interpret it that cg-restore without arguments restores removed files
> but not modified ones.
>
> "If passed a set of file names, it restores those files to their state
> as of the last commit (including bringing files removed with cg-rm back
> to life; FIXME: does not do that part yet)."
>
> I interpret it that cg-restore with arguments restores both removed and
> modified files.
>
> Maybe we need an option whether to restore modified files? Or maybe
> they should always be restored (I think it would more consistent)? Then
> the help text should be more clear about modified files.
>
> The actual behavior is that modified files are never restored. We need
> "-f" option for git-checkout-cache to overwrite existing files, and it's
> not used whether the filenames are specified or not. I wanted to send a
> patch, but after reading help I'm not sure what exactly cg-restore is
> supposed to do.
in the meantime, I actually implemented the -f option. Now I agree that
cg-rm'd files should indeed be restored only when -f is passed. Not a
big deal yet since we don't remove them at all now. :-)
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone. -- Alan Cox
prev parent reply other threads:[~2005-07-29 8:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-15 1:45 cg-restore - restoring modified files Pavel Roskin
2005-07-29 8:48 ` Petr Baudis [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=20050729084801.GK24895@pasky.ji.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=proski@gnu.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).