This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: libjava is a train wreck.
- From: Diego Novillo <dnovillo at google dot com>
- To: Steve Kargl <sgk at troutmask dot apl dot washington dot edu>
- Cc: gcc at gcc dot gnu dot org
- Date: Wed, 06 Jun 2007 08:29:39 -0400
- Subject: Re: libjava is a train wreck.
- References: <20070605042813.GA28237@troutmask.apl.washington.edu>
On 6/5/07 12:28 AM, Steve Kargl wrote:
> Can someone explain why libjava *must* commit binary files to the
> repository? A merge of trunk to the fortran-experiments branch
> generated 70 conflicts that I need to resolve.
You should not have conflicts in libjava. You may have botched a merger
earlier. I never ran into this with the branches I've maintained. Try
copying libjava out of trunk again.