From: Reto Glauser <linux@blinkeye.ch>
To: <git@vger.kernel.org>
Subject: [BUG] git cvsexportcommit -W
Date: Wed, 10 Jun 2009 16:38:58 +0200 [thread overview]
Message-ID: <ea9100509a9a5e21b9dc193cd34f812b@blinkeye.ch> (raw)
I followed a tutorial about bi-directional git-cvs usage:
http://blogs.frugalware.org/vmiklos/2008/06/14/new_in_git_1_5_6_git_cvsexportcommit_w?blog=7&c=1&page=1&more=1&title=new_in_git_1_5_6_git_cvsexportcommit_w&tb=1&pb=1&disp=single
The new git cvsexportcommit option '-W' allows to use the same directory
for a CSV checkout and git checkout. But it doesn't work with the
autocommit feature '-c':
# git cvsexportcommit -v -W -c -p -u 65f12da
Resetting to 88de7d44a6d6343077645fb43b63e3f2907d6fdd
Applying to CVS commit 65f12da1b98c5a3546356a8c42b6aff005531cd7 from parent
88de7d44a6d6343077645fb43b63e3f2907d6fdd
Checking if patch will apply
Applying
Patch applied successfully. Adding new files and directories to CVS
Commit to CVS
Patch title (first comment line): add content to file4
Autocommit
cvs commit -F .msg 'file4'
Committed successfully to CVS
HEAD is now at 65f12da... add content to file4
Now, even though everything looks OK, the CVS is not up-to-date. Removing
the autocommit feature (-c) reveals the problem:
# git cvsexportcommit -v -W -p -u 65f12da
Resetting to 88de7d44a6d6343077645fb43b63e3f2907d6fdd
Applying to CVS commit 65f12da1b98c5a3546356a8c42b6aff005531cd7 from parent
88de7d44a6d6343077645fb43b63e3f2907d6fdd
Checking if patch will apply
Applying
Patch applied successfully. Adding new files and directories to CVS
Commit to CVS
Patch title (first comment line): add content to file4
Ready for you to commit, just run:
cvs commit -F .msg 'file4'
HEAD is now at 65f12da... add content to file4
Now,
# cvs commit -F .msg 'file4'
doesn't do anything (but return value is 0).
You need to use '-f' to force the update:
# cvs commit -f -F .msg 'file4'
/tmp/CVS/project1/file4,v <-- file4
new revision: 1.2; previous revision: 1.1
I'm using git-1.6.3.1.
reply other threads:[~2009-06-10 14:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=ea9100509a9a5e21b9dc193cd34f812b@blinkeye.ch \
--to=linux@blinkeye.ch \
--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).