Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Sep 2009 11:41:30 +0400 (MSD)
From:      Dmitry Morozovsky <marck@rinet.ru>
To:        current@FreeBSD.org
Subject:   Dumb SVN question: update between branches
Message-ID:  <alpine.BSF.2.00.0909021134080.10335@woozle.rinet.ru>

next in thread | raw e-mail | index | archive | help
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 ***
------------------------------------------------------------------------



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.0909021134080.10335>