[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Understanding copying/replacing

From: Mike Mason <mgm_at_thoughtworks.net>
Date: 2004-01-19 18:00:23 CET

mark benedetto king wrote:

>It does need to be -r 767:768. It doesn't technically need to be
>a single revision; he could just use multiple "svn merge" invocations
>to get each of them (or perhaps a single one specifying a revision
>range, if they happen to be contiguous). One nice feature of merge
>is that it takes place in the WC; you can do as many merges as you
>want before committing.
>Also, your example hints that you keep a WC of your *entire repository*!
Yeah, I don't actually do that, but I'm not actually doing any merging
at all right now and had forgotten about the switch command when writing
the email.

>That would be a big WC, once you had lots of tags and branches. This
>is not necessary; you only really need one WC:
>svn co http://foo/svn/trunk mywc
>cd mywc
>(apply fix to flibble.c)
>svn commit -m "Fixed word wrap bug in flibble" flibble.c
>Commited revision 768.
>svn switch http://foo/svn/branches/customerA
>svn merge -r 767:768 http://foo/svn/trunk
>svn commit -m "Merged r768 (word wrap bug) to customerA branch"


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 19 18:00:54 2004

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.