From owner-freebsd-current@FreeBSD.ORG Wed Sep 2 08:41:23 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 4236B1065672 for ; Wed, 2 Sep 2009 08:41:23 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) by mx1.freebsd.org (Postfix) with ESMTP id BEA318FC0C for ; Wed, 2 Sep 2009 08:41:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by woozle.rinet.ru (8.14.3/8.14.3) with ESMTP id n828fJCD029747; Wed, 2 Sep 2009 12:41:19 +0400 (MSD) (envelope-from marck@rinet.ru) Date: Wed, 2 Sep 2009 12:41:19 +0400 (MSD) From: Dmitry Morozovsky To: Aristedes Maniatis In-Reply-To: <4A9E28BF.7080007@ish.com.au> Message-ID: References: <4A9E28BF.7080007@ish.com.au> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) X-NCC-RegID: ru.rinet X-OpenPGP-Key-ID: 6B691B03 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (woozle.rinet.ru [0.0.0.0]); Wed, 02 Sep 2009 12:41:19 +0400 (MSD) 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:41:23 -0000 On Wed, 2 Sep 2009, Aristedes Maniatis wrote: AM> On 2/09/09 5:41 PM, Dmitry Morozovsky wrote: AM> > what in this case I should do to have stable/8 (retaining my local AM> > changes, AM> > otherwise I'd just blow the whole tree up and re-checkout it). Sure I can AM> > store AM> > `svn diff' output, checkout fresh tree and try to apply diff there, but AM> > this AM> > way does not seem natural to me. AM> AM> "svn switch" will do what you want. I find it helpful to create a patch as AM> backup first just in case something goes wrong. Ah thanks a lot. I somehow overlooked this simple and straightforward way ;-) -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: marck@FreeBSD.org ] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru *** ------------------------------------------------------------------------