From users-return-1323-daniel=haxx.se@subversion.apache.org Tue Mar 2 15:19:12 2010 Return-Path: Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9) with SMTP id o22EJB6S029436 for ; Tue, 2 Mar 2010 15:19:12 +0100 Received: (qmail 43939 invoked by uid 500); 2 Mar 2010 14:19:06 -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 43932 invoked by uid 99); 2 Mar 2010 14:19:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Mar 2010 14:19:06 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [213.86.135.44] (HELO ln1mx01.ldsam.com) (213.86.135.44) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Mar 2010 14:18:57 +0000 Received: from LN1EXC03.ad.linedata.com ([10.112.11.142]) by ln1exc03 ([10.112.11.142]) with mapi; Tue, 2 Mar 2010 14:18:34 +0000 From: Giulio Troccoli To: "'J. Bakshi'" CC: "users@subversion.apache.org" Content-Class: urn:content-classes:message Date: Tue, 2 Mar 2010 14:18:33 +0000 Subject: RE: strange problem with subversion merge Thread-Topic: strange problem with subversion merge Thread-Index: Acq6Bjj5AOC2E4R1RJmzFFpwGOC1UAADFRZQ Message-ID: <6680A70380E6BA44A2D94ED7085718EE19DE2D8E64@ln1exc03> References: <4B8CF3AB.6020202@infoservices.in> <6680A70380E6BA44A2D94ED7085718EE19DE2D8E15@ln1exc03> <4B8CFCB6.9020802@infoservices.in> <6680A70380E6BA44A2D94ED7085718EE19DE2D8E2A@ln1exc03> <4B8D085C.1080208@infoservices.in> In-Reply-To: <4B8D085C.1080208@infoservices.in> Accept-Language: en-US, en-GB Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US, en-GB Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 > >>>> ```````````````` > >>>> svn merge -r 475:476 trunk/ > >>>> ````````````````` > ```````````````` > svn merge --dry-run -r 490:491 trunk/typo3conf/ branches/bug/ > Skipped missing target: 'branches/bug/localconf.php' > ``````````` But these commands are not the same.