This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: update: last gui merge before stage 3
- From: "graydon hoare" <graydon at redhat dot com>
- To: "java-patches.gcc.gnu.org" <java-patches at gcc dot gnu dot org>
- Date: Thu, 02 Sep 2004 03:05:42 -0400
- Subject: Re: update: last gui merge before stage 3
- Organization: red hat
- References: <opsdn2lah9tgmzw2@dub.venge.net> <opsdooxvl8tgmzw2@dub.venge.net>
On Thu, 02 Sep 2004 01:16:33 -0400, graydon hoare <graydon@redhat.com> wrote:
I received positive responses so I have committed it. I'll do a
secondary test here to be sure. please let me know asap if you see
breakage on the trunk.
secondary build test revealed that my remarkable skill for hitting
CVS corner cases was not to be outdone: the merge broke HEAD again.
here is the play by play:
- the cvs checkout was done with -r HEAD
- this set a sticky tag
- 'cvs add'ing files to HEAD marks them as such
- 'cvs up -A' before commit *does not* clear the sticky tag
from added files, only non-added but modified files
(despite what cvs docs might imply)
- 'cvs commit' skips the files with HEAD as a sticky tag,
such as the 30 new files
I've corrected this, but any autotesters which kicked off around
05:00 UTC will have caught a broken HEAD state. I'm redoing a fresh
build test now.
my apologies for this curse.
-graydon