Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1884C9A44 for ; Thu, 2 Feb 2012 11:53:26 +0000 (UTC) Received: (qmail 11190 invoked by uid 500); 2 Feb 2012 11:53:25 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 11131 invoked by uid 500); 2 Feb 2012 11:53:24 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 11124 invoked by uid 99); 2 Feb 2012 11:53:24 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Feb 2012 11:53:24 +0000 X-ASF-Spam-Status: No, hits=0.7 required=5.0 tests=RCVD_IN_DNSWL_NONE,SPF_NEUTRAL X-Spam-Check-By: apache.org Received-SPF: neutral (nike.apache.org: local policy) Received: from [81.103.221.47] (HELO mtaout01-winn.ispmail.ntl.com) (81.103.221.47) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Feb 2012 11:53:16 +0000 Received: from aamtaout02-winn.ispmail.ntl.com ([81.103.221.35]) by mtaout01-winn.ispmail.ntl.com (InterMail vM.7.08.04.00 201-2186-134-20080326) with ESMTP id <20120202115253.UQXQ3550.mtaout01-winn.ispmail.ntl.com@aamtaout02-winn.ispmail.ntl.com>; Thu, 2 Feb 2012 11:52:53 +0000 Received: from cpc2-farn6-0-0-cust204.6-2.cable.virginmedia.com ([86.16.124.205]) by aamtaout02-winn.ispmail.ntl.com (InterMail vG.3.00.04.00 201-2196-133-20080908) with ESMTP id <20120202115253.PZHZ5924.aamtaout02-winn.ispmail.ntl.com@cpc2-farn6-0-0-cust204.6-2.cable.virginmedia.com>; Thu, 2 Feb 2012 11:52:53 +0000 Received: by cpc2-farn6-0-0-cust204.6-2.cable.virginmedia.com (Postfix, from userid 1000) id 6A37E36222; Thu, 2 Feb 2012 11:52:51 +0000 (GMT) From: Philip Martin To: Markus Schaber Cc: "Subversion Users \(users\@subversion.apache.org\)" Subject: Re: AW: Problem with reverting References: <727D8E16AE957149B447FE368139F2B50D722563@SERVER10> <20120201171257.GH16977@ted.stsp.name> <727D8E16AE957149B447FE368139F2B50D72374C@SERVER10> <20120202094327.GB23501@ted.stsp.name> <727D8E16AE957149B447FE368139F2B50D7237AE@SERVER10> <20120202105810.GC23501@ted.stsp.name> <727D8E16AE957149B447FE368139F2B50D72387B@SERVER10> Date: Thu, 02 Feb 2012 11:52:51 +0000 In-Reply-To: <727D8E16AE957149B447FE368139F2B50D72387B@SERVER10> (Markus Schaber's message of "Thu, 2 Feb 2012 11:32:43 +0000") Message-ID: <87haz98nak.fsf@stat.home.lan> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Cloudmark-Analysis: v=1.1 cv=JvdXmxIgLJv2/GthKqHpGJEEHukvLcvELVXUanXFreg= c=1 sm=0 a=dmETdrZ3I3YA:10 a=sOaj6hhuNKAA:10 a=kj9zAlcOel0A:10 a=rcxwaghiAAAA:8 a=83eZBYsUAAAA:8 a=OkVmS4rPSLDJdx_9Y10A:9 a=CjuIK1q_8ugA:10 a=OP2kdKBRM3cA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 X-Virus-Checked: Checked by ClamAV on apache.org Markus Schaber writes: >> Can you describe in detail how the tree conflict came about? > > I tried to create a self-contained example, but it seems that, in > those examples, the conflict comes out differently, I cannot get the > tree conflict to appear. I added an example to the issue: http://subversion.tigris.org/issues/show_bug.cgi?id=4109 Is that the problem you are seeing? -- Philip