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

RE: Re: Maintain Directory Structure When Tagging Files

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-07-28 19:37:08 CEST

> -----Original Message-----
> From: Rob Wilkerson [mailto:r.d.wilkerson@gmail.com]
>
>
> Either I'm not understanding your response or I'm not explaining this
> very well. Whichever is the case, I'll apologize now for being so
> thick. Let me try again...
>
> 1. I have a product code base that exists in some form on the trunk
> 2. Once a full release of the product has been tagged and released, I
> create a maintenance branch
> 3. Several bugs are uncovered in the recently released code base that
> we choose to release as a hotfix
> 4. I may or may not branch from the maintenance branch to fix these
> bugs, but either way several files in several dispersed locations are
> modified and, when all is said and done, the maintenance branch is
> updated (either through a merge or direct development)

You have baseline A. (the original release.)
You have baseline B. (the maintenance patch.)
You need the delta/diff of B - A.

You can do an 'svn log -v -r A+1:B svn_url' and parse the list of
changed files to build your hotfix patch.
 (A+1 is revision number of baseline A plus 1. B is the revision number
of baseline B.)

Or you can export both baselines and diff them to generate the the list
of changed files.

I would not use 'svn diff' to find the delta because, last I checked,
'svn diff' underreports differences because it doesn't walk into
directories in certain cases (dir_conflicts/evil_twins I think.)

Ignore my comment about merging. However, it may be possible to
*un*merge baseline A from baseline B, leaving just the hotfix tree.
Maybe.

How do you plan on handling files that were deleted in the hotfix...?
Overwriting only works for adding or modifying files.

AFAIK, there's no way to tell subversion to extract just the files
committed in revision 123 (i.e. the files in the changeset.)

*****

The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. AL622

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 28 19:40:03 2006

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