ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jesse Glick <Jesse.Gl...@netbeans.com>
Subject cvs add for patches (Was: Re: Chmod Ant Workn' :))
Date Mon, 04 Sep 2000 14:56:15 GMT
"Julian M. Savage" wrote:
> ps. While I'm writing this message, I'd like to ask anyone who has
> suggestions for how to create a cvs patch file which includes new source
> files which you haven't added with "cvs add" to tell me how it's done. I
> can't see a way to make cvs do that. Note, I know about the -N option, but
> that only works if you actually do a cvs add, which is all find and good,
> until someone else actually commits your patch, and you're left with an
> unresolved conflict which (I assume) you have to fix by manually editing
> your CVS Entries file.

For any file Foo.java you add, add a line to your CVS/Entries in the
same directory:

/Foo.java/0/whenever//

Easy enough. CVS will think it has been added, and "cvs diff -u" and so
on will work correctly. I do this routinely on my laptop when I am
working at home. It is just a quirk of CVS that it requires the "cvs
add" command to contact the server (and check write permission on the
directory) when you are really only making an uncommitted local
modification like any other.

-Jesse

-- 
Jesse Glick   <mailto:Jesse.Glick@netbeans.com>
NetBeans, Open APIs  <http://www.netbeans.org/>
tel (+4202) 3300-9161 Sun Micro x49161 Praha CR

Mime
View raw message