gcc/f/intdoc.in

craig@jcb-sc.com craig@jcb-sc.com
Sun Feb 14 21:54:00 GMT 1999


>  In message < 19990214133508.9871.qmail@deer >you write:
>  > I've committed this patch, on both the mainline and the egcs-1.1 branch.
>  > 
>  > Also, I've been noticing that I don't get *two* mails from the egcs-cvs
>  > when I do "cvs commit -m ... egcs egcs-1.1".
>  > 
>  > That is, when I commit changes to both the mainline and the 1.1 branch
>  > in one operation, I get only a single email back from egcs-cvs, which
>  > doesn't seem to mention the 1.1 branch changes.
>  > 
>  > Dunno if this is a bug, but it is curious.
>I haven't seen any fortran checkins for the egcs-1.1 branch.

Maybe I've been a bad boy, doing what I've done.  Let's see:-

>How precisely are you trying to check in changes to both trees?  Normally
>this requires two source trees and two checkins.

I have my "cvs" directory in which I do this stuff.  I've done "cvs checkout
egcs" to get the mainline, "cvs checkout -r egcs_1_1_branch egcs-1.1" to
get the branch.  Then I've done "cvs update" on each, on occasion.

A few patches I've created (usually on copies of these directories,
so I can isolate what I'm doing and review it, after which I use
`diff' to create a patch which I then apply to the cvs/ directories)
have been applicable to both checked-out directories.

So, after applying the patches to both directories, I've done:

  cvs commit -m whatever egcs egcs-1.1

And, the response I've has strongly suggested that both branches' files
have been updated accordingly, just as if I'd done:

  cvs commit -m whatever egcs
  cvs commit -m whatever egcs-1.1

Two things I've noticed: one, the single-command approach yields
a curious/spurious diagnostic after it's seemingly done; two,
I don't get an email from egcs-cvs that notifies me (us) about the
changes to the egcs_1_1_branch branch.

Here's a sample shell session illustrating this dual-commit approach
I'm using (again, maybe I'm being naughty, it just seemed reasonable
that it might work):

[craig@deer cvs]$ cygcvs commit -m "bump g77's version.c" egcs egcs-1.1
cvs commit: Examining egcs
cvs commit: Examining egcs/INSTALL
cvs commit: Examining egcs/config
[...blah blah blah...]
cvs commit: Examining egcs/xiberty
cvs commit: Examining egcs-1.1
cvs commit: Examining egcs-1.1/INSTALL
cvs commit: Examining egcs-1.1/config
[...blah blah blah...]
cvs commit: Examining egcs-1.1/xiberty
Enter passphrase for RSA key 'craig@jcb-sc.com': *****

Checking in egcs/gcc/f/ChangeLog;
/egcs/carton/cvsfiles/egcs/gcc/f/ChangeLog,v  <--  ChangeLog
new revision: 1.102; previous revision: 1.101
done
Checking in egcs/gcc/f/version.c;
/egcs/carton/cvsfiles/egcs/gcc/f/version.c,v  <--  version.c
new revision: 1.20; previous revision: 1.19
done
Checking in egcs-1.1/gcc/f/ChangeLog;
/egcs/carton/cvsfiles/egcs/gcc/f/ChangeLog,v  <--  ChangeLog
new revision: 1.54.2.23; previous revision: 1.54.2.22
done
Checking in egcs-1.1/gcc/f/version.c;
/egcs/carton/cvsfiles/egcs/gcc/f/version.c,v  <--  version.c
new revision: 1.13.2.6; previous revision: 1.13.2.5
done
Cannot open file /tmp/#egcscvs.lastdir.6986.
[craig@deer cvs]$

See that last diagnostic?  Anyway, it does seem to work, based on
the output.

Just to make sure my 1.1-branch commits weren't dropping off the face
of the earth, I've just done:

  cvs checkout -r egcs_1_1_branch -d egcs-1.1.2 egcs

I then did `diff -rcp2N egcs-1.1/... egcs-1.1.2/...' to compare my "working"
copy of the egcs_1_1_branch of egcs and the newly-checked-out one, which
is below.  I don't *think* CVS cheated -- by "stealing" the copy from
egcs-1.1, thereby foiling my attempt to verify my commits actually
nmade it to the repository -- because the checkout of the new copy took
the usual, long, time.  (The diffs below are just for the g77 parts of
egcs, i.e. `...' is `gcc/f' and then `libf2c' in two successive `diff'
commands, outputs appended here.)


diff -rcp2N egcs-1.1/gcc/f/CVS/Entries egcs-1.1.2/gcc/f/CVS/Entries
*** egcs-1.1/gcc/f/CVS/Entries	Sun Feb 14 20:42:54 1999
--- egcs-1.1.2/gcc/f/CVS/Entries	Mon Feb 15 00:12:10 1999
***************
*** 1,3 ****
--- 1,4 ----
  /BUGS/1.1.1.3.4.2/Mon Nov 23 10:03:34 1998//Tegcs_1_1_branch
+ /ChangeLog/1.54.2.23/Sun Feb 14 17:41:28 1999//Tegcs_1_1_branch
  /ChangeLog.egcs/1.61.2.1/Wed Jul 15 10:01:19 1998//Tegcs_1_1_branch
  /INSTALL/1.6.4.2/Mon Nov 23 10:03:36 1998//Tegcs_1_1_branch
***************
*** 50,53 ****
--- 51,55 ----
  /install0.texi/1.2/Tue Sep 23 06:38:19 1997//Tegcs_1_1_branch
  /intdoc.c/1.8.2.1/Wed Jul 15 09:35:57 1998//Tegcs_1_1_branch
+ /intdoc.in/1.8.2.3/Sun Feb 14 05:28:12 1999//Tegcs_1_1_branch
  /intdoc.texi/1.11.2.2/Mon Nov 23 08:36:03 1998//Tegcs_1_1_branch
  /intrin.c/1.7/Tue Jun 16 02:23:25 1998//Tegcs_1_1_branch
***************
*** 64,67 ****
--- 66,70 ----
  /name.c/1.2/Tue May 19 10:49:55 1998//Tegcs_1_1_branch
  /name.h/1.2/Tue May 19 10:49:56 1998//Tegcs_1_1_branch
+ /news.texi/1.17.2.6/Sun Feb 14 05:09:13 1999//Tegcs_1_1_branch
  /news0.texi/1.1.1.1/Tue Aug 12 07:47:35 1997//Tegcs_1_1_branch
  /output.j/1.1/Mon Jun 15 07:37:28 1998//Tegcs_1_1_branch
***************
*** 121,131 ****
  /type.c/1.2/Tue May 19 10:50:52 1998//Tegcs_1_1_branch
  /type.h/1.2/Tue May 19 10:50:53 1998//Tegcs_1_1_branch
  /version.h/1.2/Tue May 19 10:25:05 1998//Tegcs_1_1_branch
  /where.c/1.2/Tue May 19 10:50:54 1998//Tegcs_1_1_branch
  /where.h/1.2/Tue May 19 10:50:55 1998//Tegcs_1_1_branch
! /news.texi/1.17.2.6/Sun Feb 14 13:07:31 1999//Tegcs_1_1_branch
! D/gbe////
! D/runtime////
! /intdoc.in/1.8.2.3/Sun Feb 14 13:26:55 1999//Tegcs_1_1_branch
! /ChangeLog/1.54.2.23/Mon Feb 15 01:39:42 1999//Tegcs_1_1_branch
! /version.c/1.13.2.6/Mon Feb 15 01:39:25 1999//Tegcs_1_1_branch
--- 124,130 ----
  /type.c/1.2/Tue May 19 10:50:52 1998//Tegcs_1_1_branch
  /type.h/1.2/Tue May 19 10:50:53 1998//Tegcs_1_1_branch
+ /version.c/1.13.2.6/Sun Feb 14 17:41:29 1999//Tegcs_1_1_branch
  /version.h/1.2/Tue May 19 10:25:05 1998//Tegcs_1_1_branch
  /where.c/1.2/Tue May 19 10:50:54 1998//Tegcs_1_1_branch
  /where.h/1.2/Tue May 19 10:50:55 1998//Tegcs_1_1_branch
! D
diff -rcp2N egcs-1.1/gcc/f/gbe/CVS/Entries egcs-1.1.2/gcc/f/gbe/CVS/Entries
*** egcs-1.1/gcc/f/gbe/CVS/Entries	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/gbe/CVS/Entries	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- D
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/gbe/CVS/Repository egcs-1.1.2/gcc/f/gbe/CVS/Repository
*** egcs-1.1/gcc/f/gbe/CVS/Repository	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/gbe/CVS/Repository	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- /egcs/carton/cvsfiles/egcs/gcc/f/gbe
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/gbe/CVS/Root egcs-1.1.2/gcc/f/gbe/CVS/Root
*** egcs-1.1/gcc/f/gbe/CVS/Root	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/gbe/CVS/Root	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- burley@egcs.cygnus.com:/egcs/carton/cvsfiles
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/runtime/CVS/Entries egcs-1.1.2/gcc/f/runtime/CVS/Entries
*** egcs-1.1/gcc/f/runtime/CVS/Entries	Sun Feb 14 08:28:03 1999
--- egcs-1.1.2/gcc/f/runtime/CVS/Entries	Wed Dec 31 19:00:00 1969
***************
*** 1,3 ****
- D/libF77////
- D/libI77////
- D/libU77////
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/runtime/CVS/Repository egcs-1.1.2/gcc/f/runtime/CVS/Repository
*** egcs-1.1/gcc/f/runtime/CVS/Repository	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/runtime/CVS/Repository	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- /egcs/carton/cvsfiles/egcs/gcc/f/runtime
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/runtime/CVS/Root egcs-1.1.2/gcc/f/runtime/CVS/Root
*** egcs-1.1/gcc/f/runtime/CVS/Root	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/runtime/CVS/Root	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- burley@egcs.cygnus.com:/egcs/carton/cvsfiles
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/runtime/libF77/CVS/Entries egcs-1.1.2/gcc/f/runtime/libF77/CVS/Entries
*** egcs-1.1/gcc/f/runtime/libF77/CVS/Entries	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/runtime/libF77/CVS/Entries	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- D
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/runtime/libF77/CVS/Repository egcs-1.1.2/gcc/f/runtime/libF77/CVS/Repository
*** egcs-1.1/gcc/f/runtime/libF77/CVS/Repository	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/runtime/libF77/CVS/Repository	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- /egcs/carton/cvsfiles/egcs/gcc/f/runtime/libF77
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/runtime/libF77/CVS/Root egcs-1.1.2/gcc/f/runtime/libF77/CVS/Root
*** egcs-1.1/gcc/f/runtime/libF77/CVS/Root	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/runtime/libF77/CVS/Root	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- burley@egcs.cygnus.com:/egcs/carton/cvsfiles
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/runtime/libI77/CVS/Entries egcs-1.1.2/gcc/f/runtime/libI77/CVS/Entries
*** egcs-1.1/gcc/f/runtime/libI77/CVS/Entries	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/runtime/libI77/CVS/Entries	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- D
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/runtime/libI77/CVS/Repository egcs-1.1.2/gcc/f/runtime/libI77/CVS/Repository
*** egcs-1.1/gcc/f/runtime/libI77/CVS/Repository	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/runtime/libI77/CVS/Repository	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- /egcs/carton/cvsfiles/egcs/gcc/f/runtime/libI77
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/runtime/libI77/CVS/Root egcs-1.1.2/gcc/f/runtime/libI77/CVS/Root
*** egcs-1.1/gcc/f/runtime/libI77/CVS/Root	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/runtime/libI77/CVS/Root	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- burley@egcs.cygnus.com:/egcs/carton/cvsfiles
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/runtime/libU77/CVS/Entries egcs-1.1.2/gcc/f/runtime/libU77/CVS/Entries
*** egcs-1.1/gcc/f/runtime/libU77/CVS/Entries	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/runtime/libU77/CVS/Entries	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- D
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/runtime/libU77/CVS/Repository egcs-1.1.2/gcc/f/runtime/libU77/CVS/Repository
*** egcs-1.1/gcc/f/runtime/libU77/CVS/Repository	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/runtime/libU77/CVS/Repository	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- /egcs/carton/cvsfiles/egcs/gcc/f/runtime/libU77
--- 0 ----
diff -rcp2N egcs-1.1/gcc/f/runtime/libU77/CVS/Root egcs-1.1.2/gcc/f/runtime/libU77/CVS/Root
*** egcs-1.1/gcc/f/runtime/libU77/CVS/Root	Sun Feb 14 08:20:39 1999
--- egcs-1.1.2/gcc/f/runtime/libU77/CVS/Root	Wed Dec 31 19:00:00 1969
***************
*** 1 ****
- burley@egcs.cygnus.com:/egcs/carton/cvsfiles
--- 0 ----
diff -rcp2N egcs-1.1/libf2c/CVS/Entries egcs-1.1.2/libf2c/CVS/Entries
*** egcs-1.1/libf2c/CVS/Entries	Sun Feb 14 22:01:54 1999
--- egcs-1.1.2/libf2c/CVS/Entries	Mon Feb 15 00:12:10 1999
***************
*** 1,2 ****
--- 1,3 ----
+ /ChangeLog/1.24.2.14/Sun Feb 14 19:00:23 1999//Tegcs_1_1_branch
  /ChangeLog.egcs/1.15.2.4/Thu Jul 16 21:34:31 1998//Tegcs_1_1_branch
  /Makefile.in/1.14.2.7/Fri Oct  2 00:29:06 1998//Tegcs_1_1_branch
*************** D/libF77////
*** 15,17 ****
  D/libI77////
  D/libU77////
- /ChangeLog/1.24.2.14/Mon Feb 15 03:00:53 1999//Tegcs_1_1_branch
--- 16,17 ----
diff -rcp2N egcs-1.1/libf2c/libI77/CVS/Entries egcs-1.1.2/libf2c/libI77/CVS/Entries
*** egcs-1.1/libf2c/libI77/CVS/Entries	Sun Feb 14 22:01:54 1999
--- egcs-1.1.2/libf2c/libI77/CVS/Entries	Mon Feb 15 00:02:50 1999
***************
*** 2,5 ****
--- 2,6 ----
  /Notice/1.1/Sun Feb  1 01:37:07 1998//Tegcs_1_1_branch
  /README.netlib/1.1/Sun Feb  1 01:37:07 1998//Tegcs_1_1_branch
+ /Version.c/1.6.2.3/Sun Feb 14 19:00:26 1999//Tegcs_1_1_branch
  /backspace.c/1.3/Tue Jun 23 14:37:07 1998//Tegcs_1_1_branch
  /close.c/1.3/Tue May 19 10:51:03 1998//Tegcs_1_1_branch
***************
*** 43,46 ****
  /wsne.c/1.2/Tue May 19 10:51:19 1998//Tegcs_1_1_branch
  /xwsne.c/1.1/Sun Feb  1 01:37:07 1998//Tegcs_1_1_branch
- /Version.c/1.6.2.3/Mon Feb 15 03:00:54 1999//Tegcs_1_1_branch
  D
--- 44,46 ----

Okay, so I can't really easily guess what all the above means, but
you'll note that *no* differences in non-CVS-control portions of
the branch exist.

That tells me that my commits *did* work, so I wasn't *totally* out
to lunch trying commits to two "differently-rooted" (?) checked-out
trees in a single command.  (Although maybe my local CVS has a bug
causing that spurious diagnostic about /tmp/whatever, and maybe
your CVS repository server has a bug causing it to forget to email
egcs-cvs about the egcs_1_1_branch checkin.)

But, to play it safe, I'll just check in with one file or directory
on the command line at a time, at least for now, until somebody
in the know tells me it's safe.  (Saves me typing my passphrase
extra times.)

Right now, just to be extra-sure, I'm checking out an extra copy
of the mainline, to compare with my working copy, to see if,
somehow, some of those *branch* commits ended up in the mainline
as well.  I doubt it, but will let you know if I see anything
strange.

        tq vm, (burley)


More information about the Gcc-patches mailing list