From owner-freebsd-current@FreeBSD.ORG Wed Sep 2 07:54:49 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 CFBBA106566B for ; Wed, 2 Sep 2009 07:54:49 +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 5BC7A8FC14 for ; Wed, 2 Sep 2009 07:54:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by woozle.rinet.ru (8.14.3/8.14.3) with ESMTP id n827fUwm013242 for ; Wed, 2 Sep 2009 11:41:30 +0400 (MSD) (envelope-from marck@rinet.ru) Date: Wed, 2 Sep 2009 11:41:30 +0400 (MSD) From: Dmitry Morozovsky To: current@FreeBSD.org Message-ID: 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 11:41:30 +0400 (MSD) Cc: Subject: 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 07:54:49 -0000 Dear colleagues, I've found myself bumping against the wall with very stupid thing, quick googling did not help: what is SVN's analog of 'cvs update -r BRANCH' (in FreeBSD repo's case)? Example: in CVS case -- marck@revamp:/usr/src> cvs -R st Makefile =================================================================== File: Makefile Status: Up-to-date Working revision: 1.341.2.7 Thu Mar 19 20:48:18 2009 Repository revision: 1.341.2.7 /home/ncvs/src/Makefile,v Sticky Tag: RELENG_7 (branch: 1.341.2) Sticky Date: (none) Sticky Options: (none) marck@revamp:/usr/src> cvs -R up -r RELENG_8 [snip] marck@revamp:/usr/src> cvs -R st Makefile =================================================================== File: Makefile Status: Up-to-date Working revision: 1.358.2.1 Wed Sep 2 07:37:32 2009 Repository revision: 1.358.2.1 /home/ncvs/src/Makefile,v Sticky Tag: RELENG_8 (branch: 1.358.2) Sticky Date: (none) Sticky Options: (none) -- In SVN case I have: marck@hamster:/usr/src> svn info Path: . URL: file:///FreeBSD/svn/base/head Repository Root: file:///FreeBSD/svn/base Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f Revision: 196740 Node Kind: directory Schedule: normal Last Changed Author: trasz Last Changed Rev: 196740 Last Changed Date: 2009-09-01 22:30:17 +0400 (Tue, 01 Sep 2009) 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. Any hints? Thanks! -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: marck@FreeBSD.org ] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru *** ------------------------------------------------------------------------