Received: from spf3.us4.outblaze.com (spf3.us4.outblaze.com [205.158.62.25]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id iAFD2cVk001473 for ; Mon, 15 Nov 2004 13:02:39 GMT Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf3.us4.outblaze.com (Postfix) with ESMTP id 123F154721 for ; Mon, 15 Nov 2004 13:00:07 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CTgbN-0008O3-CE for migo@homemail.com; Mon, 15 Nov 2004 08:09:01 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CTgZ5-0007Su-No for gnu-arch-users@gnu.org; Mon, 15 Nov 2004 08:06:39 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CTgZ5-0007Sd-9N for gnu-arch-users@gnu.org; Mon, 15 Nov 2004 08:06:39 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CTgWg-0006Qd-PG for gnu-arch-users@gnu.org; Mon, 15 Nov 2004 08:04:10 -0500 Received: from [66.216.124.41] (helo=server4.panoramicfeedback.com) by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.34) id 1CTgNe-0000Wb-AC for gnu-arch-users@gnu.org; Mon, 15 Nov 2004 07:54:50 -0500 Received: from [192.168.0.7] (server4.panoramicfeedback.com [66.216.124.41]) by server4.panoramicfeedback.com (8.12.3/8.12.3/Debian-6.6) with ESMTP id iAFCsgil024603; Mon, 15 Nov 2004 07:54:42 -0500 Message-ID: <4198A712.9050403@panoramicfeedback.com> Date: Mon, 15 Nov 2004 07:54:42 -0500 From: Aaron Bentley User-Agent: Mozilla Thunderbird 0.8 (X11/20040926) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Martin Langhoff Subject: Re: [Gnu-arch-users] Out-of-order patch merging and tla update References: <46a038f904111500125ffdd300@mail.gmail.com> In-Reply-To: <46a038f904111500125ffdd300@mail.gmail.com> X-Enigmail-Version: 0.86.1.0 X-Enigmail-Supports: pgp-inline, pgp-mime Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Panometrics-MailScanner: Found to be clean Cc: Arch Users X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 792 Lines: 25 Martin Langhoff wrote: > We deploy to production doing `tla update`, but sometimes, we deploy > individual patches out-of-order using get-patch and do-changeset. You may want to look at 'tla replay REVISION' for this. > Are there ways to achieve the same goals without tla getting so > confused? A "production" branch were we merge things to? I'd recommend having a production branch. That way, you can also get the latest production revision, etc. When you want to get 'production' up-to-date with 'devel', tla replay [--skip-present] VERSION is your friend. Aaron _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/