From users-return-768-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org Mon Feb 01 22:50:19 2010 Return-Path: Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: (qmail 52556 invoked from network); 1 Feb 2010 22:50:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Feb 2010 22:50:19 -0000 Received: (qmail 1426 invoked by uid 500); 1 Feb 2010 22:50:18 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 1383 invoked by uid 500); 1 Feb 2010 22:50:18 -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 Delivered-To: moderator for users@subversion.apache.org Received: (qmail 93285 invoked by uid 99); 1 Feb 2010 22:48:35 -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: domain of prvs=641e2576c=Jeff.Abbott@caemilusa.com designates 198.47.10.16 as permitted sender) DomainKey-Signature: s=tampa; d=caemilusa.com; c=nofws; q=dns; h=Authentication-Results:X-IronPort-AV:Received:Received: X-MimeOLE:Content-class:MIME-Version:Subject:Date: Message-ID:X-MS-Has-Attach:X-MS-TNEF-Correlator: Thread-Topic:thread-index:From:To:Return-Path: X-OriginalArrivalTime:X-TM-AS-Product-Ver:X-TM-AS-Result: X-TM-AS-User-Approved-Sender:X-TM-AS-User-Blocked-Sender: Content-Type:Content-Transfer-Encoding; b=jyL7nPK6LjY06CNByoVLkbdYAqN93tfKVJCzJDtfIsX6g+cWbarBkY0E n5hiLZUpn7aOUGmcIbLddl6zod6dIqKTlHVhMykiAF12Ov9hGcgwewFF+ EsRtCh8nXRScjdi; DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=caemilusa.com; i=Jeff.Abbott@caemilusa.com; q=dns/txt; s=tampa; t=1265064506; x=1296600506; h=from:sender:reply-to:subject:date:message-id:to:cc: mime-version:content-transfer-encoding:content-id: content-description:resent-date:resent-from:resent-sender: resent-to:resent-cc:resent-message-id:in-reply-to: references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:list-owner:list-archive; z=From:=20"Jeff=20Abbott"=20 |Subject:=20Tortoise=20SVN=20merge=20bug?|Date:=20Mon,=20 1=20Feb=202010=2017:47:58=20-0500|Message-ID:=20 |To:=20|MIME-Version:=201.0 |Content-Transfer-Encoding:=20quoted-printable; bh=G9l2w4h/NS0rSfjQj3DXcT5HWJCc8XS1Jz9Bov95H1U=; b=hdfovoT80TsvXZ9hfTC7xH4pl1K9a1ZXauSPKrTjJvsjDOiNNgFNdXYC MYuiMSMHdl50lXjkb1lHlrPNIKjBaDhvhFMNGp8UOhWB6m1y1meWuu3ym 68f7iLmbjEY5YBE; Authentication-Results: smtp2.caemilusa.com; dkim=neutral (message not signed) header.i=none X-IronPort-AV: E=Sophos;i="4.49,385,1262581200"; d="scan'208";a="237788" X-MimeOLE: Produced By Microsoft Exchange V6.5 Content-class: urn:content-classes:message MIME-Version: 1.0 Subject: Tortoise SVN merge bug? Date: Mon, 1 Feb 2010 17:47:58 -0500 Message-ID: X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: Tortoise SVN merge bug? thread-index: AcqjkJlYvirlGlIPR9y21nteaB3WAg== From: "Jeff Abbott" To: X-OriginalArrivalTime: 01 Feb 2010 22:48:04.0415 (UTC) FILETIME=[9D5BFCF0:01CAA390] X-TM-AS-Product-Ver: SMEX-8.0.0.1181-6.000.1038-17166.004 X-TM-AS-Result: No-3.123800-8.000000-31 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable I'm running =20 TortoiseSVN 1.6.6, Build 17493 - 32 Bit , 2009/10/19 20:22:18 =20 When I select merge I get three options. The first option "Merge a range of= revisions" produces varied results. If you want to merge an entire branch= back to the trunk (from where it was branched), it actuall does a revert w= hen you follow the instructions "To merge all revisions, leave the box empt= y." If you enter the revision range then it does work. I suspect if you l= eave it blank and check "Reverse merge" it would work also. =20 Jeff ***This e-mail message is intended only for the above named recipient(s) and may contain information that is sensitive or proprietary. If you have received this message in error or are not the named recipient(s), please=20 immediately notify the sender, delete this e-mail message without making a copy and do not disclose or relay this e-mail message to anyone.***