On Mar 6, 2008, at 21:53, Andy Levy wrote:
> On Thu, Mar 6, 2008 at 9:55 PM, Gavin 'Beau' Baumanis wrote:
>
>> I have created a branch "/branches/Production"
>> That I use for the purpose of tracking updates made to the
>> production
>> system of a web application.
>>
>> If there is an unexpected error as a result of an update to
>> production I
>> need to revert to the previous version that was in production.
>>
>> Consider; 'file1.cfm' may have several revisions made to it
>> before it
>> actually gets to production.
>> Without the production branch I would be unable to easily know
>> which of the
>> revisions for this file was indeed the last one placed into
>> production.
>>
>> Anyway,
>> Onto the problem.
>> Lets assume that I have sequentially committed to the trunk, 20
>> separate
>> file updates via 20 separate commits.
>> All 20 of these commits to the trunk need to be replicated to the
>> production branch.
>>
>> Using the above assumptions - Is there a relevant function that
>> will enable
>> me to do;
>> copy the "current state" of the 20 files from the past 20
>> commits, into a
>> new location, as 1 single commit?
>
> You want to perform a merge.
> http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html
Different answer: I would have said what you're describing is a tag,
not a branch. Make a new tag, including a version number or the date
or the revision or some unique identifier in the tag name (e.g. /tags/
production-20080306). In your production working copy, instead of
checking out /branches/Production and then later running "svn
update", you run "svn switch $REPO/tags/production-20080306". If it's
necessary to revert your production system to the previous version,
simply "svn switch $REPO/tags/production-20080305" (if for example
you had made a tag yesterday that you wanted to revert to).
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-03-07 06:54:24 CET