Mailing-List: contact cygwin-developers-help AT sourceware DOT cygnus DOT com; run by ezmlm List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-developers-owner AT sources DOT redhat DOT com Delivered-To: mailing list cygwin-developers AT sources DOT redhat DOT com Message-ID: <03f301c14c59$dfb6bd20$01000001@lifelesswks> From: "Robert Collins" To: References: <0db601c144fe$3ec53ca0$0200a8c0 AT lifelesswks> <20010924170130 DOT B31556 AT redhat DOT com> <0f5701c14546$0bd99280$0200a8c0 AT lifelesswks> <20010924183659 DOT B32477 AT redhat DOT com> <0fc101c1454a$aa8b8010$0200a8c0 AT lifelesswks> <20010924185131 DOT A32613 AT redhat DOT com> <100d01c14550$bd31eaf0$0200a8c0 AT lifelesswks> <3BBB6ED6 DOT 26A88BE3 AT yahoo DOT com> <03a501c14c58$2e1dc320$01000001 AT lifelesswks> <20011003181839 DOT C3772 AT redhat DOT com> Subject: Re: CVS branches RFC Date: Thu, 4 Oct 2001 08:22:17 +1000 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 5.50.4133.2400 X-MimeOLE: Produced By Microsoft MimeOLE V5.50.4133.2400 ----- Original Message ----- From: "Christopher Faylor" > > And, FYI, I have been merrily trying to deal with my "simple" change > of adding a path_conv call to build_fhandler. It has had some really > amazing repercussions throughout the code which I'm sure make merging > harder. I'm sure you'll be pleasantly surprised to know that it has been trivial. I have been merging every day or two and had no conflicts anywhere except ChangeLog - which is expected as cvs doesn't grok ChangeLog and simply considers it a text file changed at the top twice. Which, BTW is why I suggested these scripts - small they are, but powerful too :}. Rob