From owner-freebsd-current@FreeBSD.ORG Wed Sep 2 08:23:06 2009 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 883B9106566C for ; Wed, 2 Sep 2009 08:23:06 +0000 (UTC) (envelope-from ari@ish.com.au) Received: from fish.ish.com.au (eth5921.nsw.adsl.internode.on.net [59.167.240.32]) by mx1.freebsd.org (Postfix) with ESMTP id 2B2468FC19 for ; Wed, 2 Sep 2009 08:23:06 +0000 (UTC) Received: from ip-149.ish.com.au ([203.29.62.149]:51008) by fish.ish.com.au with esmtpa (Exim 4.69) (envelope-from ) id 1Mim7v-0002yR-1V; Wed, 02 Sep 2009 19:27:39 +1000 Message-ID: <4A9E28BF.7080007@ish.com.au> Date: Wed, 02 Sep 2009 18:11:43 +1000 From: Aristedes Maniatis User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1.3pre) Gecko/20090821 Shredder/3.0b4pre MIME-Version: 1.0 To: Dmitry Morozovsky References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: current@FreeBSD.org Subject: Re: Dumb SVN question: update between branches X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Sep 2009 08:23:06 -0000 On 2/09/09 5:41 PM, Dmitry Morozovsky wrote: > what in this case I should do to have stable/8 (retaining my local changes, > otherwise I'd just blow the whole tree up and re-checkout it). Sure I can store > `svn diff' output, checkout fresh tree and try to apply diff there, but this > way does not seem natural to me. "svn switch" will do what you want. I find it helpful to create a patch as backup first just in case something goes wrong. Ari --------------------------> ish http://www.ish.com.au Level 1, 30 Wilson Street Newtown 2042 Australia phone +61 2 9550 5001 fax +61 2 9550 4001 GPG fingerprint CBFB 84B4 738D 4E87 5E5C 5EFA EF6A 7D2E 3E49 102A