Patches to New Files not yet in CVS (was: [C] packages: Update .cvsignore for generated .info* and .html)
11:23 p.m.
|--==> "APA" == Adrian Aichner <adrian(a)xemacs.org> writes:
APA> What's the best way to produce patches for files which are not
APA> in CVS yet?
Basically the way you did it...
(setq patcher-default-diff-command "cvs -q diff -uN %f")
cvs add file1 file2 ...filen
M-x patcher-mail RET project RET subject RET
APA> I have added -N to patcher-default-diff-command temporarily.
I have it set permanently.
--
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
| XEmacs - It's not just an editor. |
| It's a way of life. |
|------------------------------------<youngs(a)xemacs.org>---|
11:37 p.m.
>>>> "SY" == Steve Youngs
<youngs(a)xemacs.org> writes:
SY> |--==> "APA" == Adrian Aichner <adrian(a)xemacs.org> writes:
APA> What's the best way to produce patches for files which are not
APA> in CVS yet?
SY> Basically the way you did it...
SY> (setq patcher-default-diff-command "cvs -q diff -uN %f")
SY> cvs add file1 file2 ...filen
Thanks for your comments Steve and Ville.
I did the cvs add but forgot to mention this in my earlier mail.
SY> M-x patcher-mail RET project RET subject RET
APA> I have added -N to patcher-default-diff-command temporarily.
SY> I have it set permanently.
Ah, so does the -N option not hurt when used on files which are not new?
SY> --
SY> |---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
SY> | XEmacs - It's not just an editor. |
SY> | It's a way of life. |
SY> |------------------------------------<youngs(a)xemacs.org>---|
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
12:08 a.m.
On Thu, 2002-08-01 at 01:37, Adrian Aichner wrote:
[...]
I did the cvs add but forgot to mention this in my earlier mail.
[...]
APA> I have added -N to patcher-default-diff-command
temporarily.
SY> I have it set permanently.
Ah, so does the -N option not hurt when used on files which are not new?
Not that I know of, I have "diff -Nau" in my ~/.cvsrc and have
experienced no problems with it.
Anyway, I'm still looking for how to do this without "cvs add"ing. But
that's kinda off topic here.
--
\/ille Skyttä
ville.skytta at xemacs.org
3:21 p.m.
Ville Skyttä <ville.skytta(a)xemacs.org>, on 01 Aug 2002 at 02:08:13 +0300
you wrote:
Anyway, I'm still looking for how to do this without "cvs
add"ing. But
that's kinda off topic here.
Not at all. That particular topic is going to impact my life very soon.
I'm working on a fairly large patch to enable system modules (i.e., bits
of stuff now in src will be turned into modules, which can be unloaded
as well as loaded). Some of my work involves adding new files to the
repository. Since I don't have commit access, it sounds like creating a
usable patch is going to be a difficult exercise.
Incidentally, some of my work also involves moving files out of src into
some subdirectory of modules. CVS doesn't cope well with file moves.
How should I go about submitting all of this?
--
Jerry James
http://www.ittc.ku.edu/~james/
3:43 p.m.
On Thu, 2002-08-01 at 17:21, Jerry James wrote:
> Anyway, I'm still looking for how to do this without
"cvs add"ing. But
> that's kinda off topic here.
Not at all. That particular topic is going to impact my life very soon.
I'm working on a fairly large patch to enable system modules (i.e., bits
of stuff now in src will be turned into modules, which can be unloaded
as well as loaded). Some of my work involves adding new files to the
repository. Since I don't have commit access, it sounds like creating a
usable patch is going to be a difficult exercise.
FWIW, I found something at <http://www.plex86.org/cvs.phtml> by
googling, the suggestion to keep two checked out copies and do a normal
diff between is the best I've found so far. Not too elegant, though.
Incidentally, some of my work also involves moving files out of src
into
some subdirectory of modules. CVS doesn't cope well with file moves.
How should I go about submitting all of this?
I guess the strategy with 2 copies works here too. I guess CVS admins
(cvs-admin＠) could do a real move directly in the repository as well...
--
\/ille Skyttä
ville.skytta at xemacs.org
5:29 p.m.
>>>> "Ville" == Ville Skytt <Ville>
writes:
Ville> On Thu, 2002-08-01 at 17:21, Jerry James wrote:
> > Anyway, I'm still looking for how to do this without
"cvs add"ing. But
> > that's kinda off topic here.
>
> Not at all. That particular topic is going to impact my life very soon.
> I'm working on a fairly large patch to enable system modules (i.e., bits
> of stuff now in src will be turned into modules, which can be unloaded
> as well as loaded). Some of my work involves adding new files to the
> repository. Since I don't have commit access, it sounds like creating a
> usable patch is going to be a difficult exercise.
Ville> FWIW, I found something at <http://www.plex86.org/cvs.phtml> by
Ville> googling, the suggestion to keep two checked out copies and do a normal
Ville> diff between is the best I've found so far. Not too elegant, though.
> Incidentally, some of my work also involves moving files out of
src into
> some subdirectory of modules. CVS doesn't cope well with file moves.
> How should I go about submitting all of this?
Ville> I guess the strategy with 2 copies works here too. I guess
Ville> CVS admins (cvs-admin＠) could do a real move directly in
Ville> the repository as well...
This would break the ability to build old versions with the file in
the old place where it's gone now.
Ville> --
Ville> \/ille Skyttä
Ville> ville.skytta at xemacs.org
--
Adrian Aichner
mailto:adrian＠xemacs.org
http://www.xemacs.org/
10:22 p.m.
|--==> "APA" == Adrian Aichner <adrian(a)xemacs.org> writes:
>>>>>"Ville" == Ville Skytt <Ville>
writes:
Ville> I guess the strategy with 2 copies works here too. I guess
Ville> CVS admins (cvs-admin＠) could do a real move directly in
Ville> the repository as well...
APA> This would break the ability to build old versions with the
APA> file in the old place where it's gone now.
Precisely. 'cvs remove' and then 'cvs add' is the way to do it.
--
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
| XEmacs - It's not just an editor. |
| It's a way of life. |
|------------------------------------<youngs(a)xemacs.org>---|
10:21 p.m.
|--==> "VS" == Ville Skytt <Ville> writes:
VS> On Thu, 2002-08-01 at 17:21, Jerry James wrote:
VS> FWIW, I found something at <http://www.plex86.org/cvs.phtml> by
VS> googling, the suggestion to keep two checked out copies and do a
VS> normal diff between is the best I've found so far. Not too
VS> elegant, though.
That would seem like the best approach to me if you don't have commit
access.
>Incidentally, some of my work also involves moving files out of
>src into some subdirectory of modules. CVS doesn't cope well with
>file moves. How should I go about submitting all of this?
VS> I guess the strategy with 2 copies works here too. I guess
VS> CVS admins (cvs-admin＠) could do a real move directly in the
VS> repository as well...
Um, no we wouldn't. If I were to physically move a file in the
repository you would no longer be able to build older versions of the
project. To "move" a file you 'cvs remove' it from one directory and
'cvs add' it to the new directory.
--
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
| XEmacs - It's not just an editor. |
| It's a way of life. |
|------------------------------------<youngs(a)xemacs.org>---|
10:06 a.m.
On Fri, 2002-08-02 at 00:21, Steve Youngs wrote:
>>Incidentally, some of my work also involves moving files
out of
>>src into some subdirectory of modules. CVS doesn't cope well with
>>file moves. How should I go about submitting all of this?
VS> I guess the strategy with 2 copies works here too. I guess
VS> CVS admins (cvs-admin＠) could do a real move directly in the
VS> repository as well...
Um, no we wouldn't. If I were to physically move a file in the
repository you would no longer be able to build older versions of the
project. To "move" a file you 'cvs remove' it from one directory and
'cvs add' it to the new directory.
Oops. Sorry, I wasn't really thinking about the context, but wanted
just to say that it is *possible* to do moves in the repository. I
didn't mean it should be done in this case.
--
\/ille Skyttä
ville.skytta at xemacs.org
10:14 p.m.
|--==> "JJ" == Jerry James <james(a)xemacs.org> writes:
JJ> Some of my work involves adding new files to the repository.
JJ> Since I don't have commit access, it sounds like creating a
JJ> usable patch is going to be a difficult exercise.
Just give me a heads up when you're ready and I'll help you get all
done.
--
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
| XEmacs - It's not just an editor. |
| It's a way of life. |
|------------------------------------<youngs(a)xemacs.org>---|
11:12 a.m.
>>>> "Ville" == Ville Skytt <Ville>
writes:
> Ah, so does the -N option not hurt when used on files which are
> not new?
Ville> Not that I know of, I have "diff -Nau" in my ~/.cvsrc and
Ville> have experienced no problems with it.
That's right. All it does is substitute /dev/null for any
non-existent file.
Ville> Anyway, I'm still looking for how to do this without "cvs
Ville> add"ing. But that's kinda off topic here.
Why? If CVS doesn't know about it, you should not be able to
manipulate it with CVS. just use "diff ... /dev/null file-to-diff",
no?
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
My nostalgia for Icon makes me forget about any of the bad things. I don't
have much nostalgia for Perl, so its faults I remember. Scott Gilbert c.l.py
9:02 p.m.
On Thu, 2002-08-08 at 13:12, Stephen J. Turnbull wrote:
Ville> Anyway, I'm still looking for how to do this
without "cvs
Ville> add"ing. But that's kinda off topic here.
Why? If CVS doesn't know about it, you should not be able to
manipulate it with CVS. just use "diff ... /dev/null file-to-diff",
no?
Sure, but when changing many files in many directories and adding some,
it would be so convenient to just be able to do a "cvs diff -Nru" and
have the new files in the diff...
Anyway, the strategy with two checked out copies works well enough for
me.
--
\/ille Skyttä
ville.skytta at xemacs.org
2:35 a.m.
>>>> "Ville" == Ville Skytt <Ville>
writes:
Ville> Sure, but when changing many files in many directories and
Ville> adding some, it would be so convenient to just be able to
Ville> do a "cvs diff -Nru" and have the new files in the diff...
You have to cvs add them eventually anyway, it's not something I'd
want to have happen without operator intervention. How about a
P______ script that runs "cvs noop", and picks up all the ?files.
Then it prompts you for CVS add or add a glob to .cvsignore.
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
My nostalgia for Icon makes me forget about any of the bad things. I don't
have much nostalgia for Perl, so its faults I remember. Scott Gilbert c.l.py
12:40 a.m.
|--==> "APA" == Adrian Aichner <adrian(a)xemacs.org> writes:
APA> I have added -N to patcher-default-diff-command temporarily.
SY> I have it set permanently.
APA> Ah, so does the -N option not hurt when used on files which are
APA> not new?
Not at all.
,----[ M-x manual-entry RET diff RET ]
| -N
| --new-file
| In directory comparison, if a file is found in only
| one directory, treat it as present but empty in the
| other directory.
`----
It only comes into play when one of the files doesn't exist.
--
|---<Steve Youngs>---------------<GnuPG KeyID: 10D5C9C5>---|
| XEmacs - It's not just an editor. |
| It's a way of life. |
|------------------------------------<youngs(a)xemacs.org>---|
7928
days inactive
7937
days old
13 comments
5 participants
participants (5)
-
Adrian Aichner -
Jerry James -
Stephen J. Turnbull -
Steve Youngs -
Ville Skyttä