Return-Path: Delivered-To: apmail-db-derby-dev-archive@www.apache.org Received: (qmail 38718 invoked from network); 2 Sep 2005 18:53:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Sep 2005 18:53:44 -0000 Received: (qmail 36253 invoked by uid 500); 2 Sep 2005 18:53:43 -0000 Delivered-To: apmail-db-derby-dev-archive@db.apache.org Received: (qmail 36219 invoked by uid 500); 2 Sep 2005 18:53:43 -0000 Mailing-List: contact derby-dev-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Reply-To: "Derby Development" Delivered-To: mailing list derby-dev@db.apache.org Received: (qmail 36206 invoked by uid 99); 2 Sep 2005 18:53:43 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2005 11:53:43 -0700 X-ASF-Spam-Status: No, hits=2.6 required=10.0 tests=DNS_FROM_RFC_ABUSE,DNS_FROM_RFC_POST,DNS_FROM_RFC_WHOIS,SPF_HELO_FAIL X-Spam-Check-By: apache.org Received-SPF: neutral (asf.osuosl.org: local policy) Received: from [32.97.182.144] (HELO e4.ny.us.ibm.com) (32.97.182.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Sep 2005 11:53:57 -0700 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e4.ny.us.ibm.com (8.12.11/8.12.11) with ESMTP id j82IreXa013618 for ; Fri, 2 Sep 2005 14:53:40 -0400 Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay02.pok.ibm.com (8.12.10/NCO/VERS6.7) with ESMTP id j82IreMj084772 for ; Fri, 2 Sep 2005 14:53:40 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.12.11/8.13.3) with ESMTP id j82IrTZ5003885 for ; Fri, 2 Sep 2005 14:53:29 -0400 Received: from [127.0.0.1] (sig-9-48-117-166.mts.ibm.com [9.48.117.166]) by d01av03.pok.ibm.com (8.12.11/8.12.11) with ESMTP id j82IrRNA003418 for ; Fri, 2 Sep 2005 14:53:29 -0400 Message-ID: <43189F9B.2060306@sbcglobal.net> Date: Fri, 02 Sep 2005 11:53:15 -0700 From: Kathey Marsden User-Agent: Mozilla Thunderbird 0.7.3 (Windows/20040803) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Derby Development Subject: Re: Problem with svn merge svn: REPORT request failed on '/repos/asf/!svn/vcc/default' References: <431733F8.2060809@sbcglobal.net> <54ac72d7050902110543ae2e26@mail.gmail.com> In-Reply-To: <54ac72d7050902110543ae2e26@mail.gmail.com> X-Enigmail-Version: 0.85.0.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Andrew McIntyre wrote: >Your best bet is probably to just reapply the original patch to the 10.1 branch. > > > Thanks Andrew for resolving this mystery ! I wanted to avoid the patch route because I was concerned about proper ancestry being maintained. I am guessing even for changes made after incubation we will need to apply some patches to 10.1 if the merge is not automatic. I don't see a way with svn to apply the merge markers only without merging the actual change. Is such a thing possible with svn? Kathey