This is the mail archive of the gcc@gcc.gnu.org mailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: libjava is a train wreck.

From: Ben Elliston <bje at au1 dot ibm dot com>
To: Diego Novillo <dnovillo at google dot com>
Cc: Steve Kargl <sgk at troutmask dot apl dot washington dot edu>, gcc at gcc dot gnu dot org
Date: Thu, 07 Jun 2007 08:43:57 +1000
Subject: Re: libjava is a train wreck.
References: <20070605042813.GA28237@troutmask.apl.washington.edu> <4666A8B3.4020105@google.com>

On Wed, 2007-06-06 at 08:29 -0400, Diego Novillo wrote:

> 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.

Out of interest, what happens if you have svn file properties that are
changed in both branches?  Will that lead to a merge conflict?

Ben

Follow-Ups:
- Re: libjava is a train wreck.
  - From: Daniel Berlin

References:
- libjava is a train wreck.
  - From: Steve Kargl
- Re: libjava is a train wreck.
  - From: Diego Novillo

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]