From users-return-1096-daniel=haxx.se@subversion.apache.org Thu Feb 18 19:15:03 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 o1IIF2jr022908 for ; Thu, 18 Feb 2010 19:15:03 +0100 Received: (qmail 67412 invoked by uid 500); 18 Feb 2010 18:14:57 -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 67402 invoked by uid 99); 18 Feb 2010 18:14:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 18:14:57 +0000 X-ASF-Spam-Status: No, hits=-1.0 required=10.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [192.109.42.8] (HELO einhorn.in-berlin.de) (192.109.42.8) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2010 18:14:47 +0000 X-Envelope-From: stsp@stsp.name Received: from jack.stsp.name (jack.stsp.name [217.197.84.187]) (authenticated bits=128) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id o1IIEJS4030946 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 18 Feb 2010 19:14:20 +0100 Received: from jack.stsp.name (stsp@localhost [127.0.0.1]) by jack.stsp.name (8.14.3/8.14.3) with ESMTP id o1IIEJEH018705; Thu, 18 Feb 2010 19:14:19 +0100 (CET) Received: (from stsp@localhost) by jack.stsp.name (8.14.3/8.14.3/Submit) id o1IIEJtQ023721; Thu, 18 Feb 2010 19:14:19 +0100 (CET) Date: Thu, 18 Feb 2010 19:14:19 +0100 From: Stefan Sperling To: Jacob Weber Cc: Rob van Oostrum , users@subversion.apache.org Subject: Re: Branch from a branch -- will merges still work? Message-ID: <20100218181419.GE18442@jack.stsp.name> References: <96020AD6-9A02-4113-B9DB-7D0EAF1FD4A2@jacobweber.com> <8dd4dbc21002180800u20b8a19ele2c7a80468ddfc34@mail.gmail.com> <8dd4dbc21002180822r7b167338xb0fc40b0f4fec3a0@mail.gmail.com> <20100218165128.GA18442@jack.stsp.name> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8 On Thu, Feb 18, 2010 at 09:37:01AM -0800, Jacob Weber wrote: > Stefan, if you're the one who added it, you might also want to link to > it in the section I mentioned, where it says "once a --reintegrate > merge is done from branch to trunk, the branch is no longer usable for > further work". Good idea, thanks! I've just committed the change you suggested. It should show up as soon as the book on the website is re-generated. Stefan