On 5/14/07, AJ Mercer <[EMAIL PROTECTED]> wrote: > Thanks John Paul. > > I deliberately left out any subversion process for two reasons > a) this is what I want to find out > b) I don't have a process and hence the question :-) > > I have read about the pre / post tagging before but was not sure how this > would go when other people are also making commits - and there fore > incrementing the revision number; so...
Revision numbers in SVN should be meaningless -- like a primary key in a db. The whole point of a branch is that it's independent of the other development line(s). You can merge the changes of just that branch back into trunk, or a release branch, or even another bugfix branch (maybe because two bugs are related). Keep in mind that when I say "merge" I mean using SVN's merge command (or using svnmerge, an addon script that makes it FAR easier to manage merging branches). The recipies for all of these kinds of manipulations are in the PragProgrammers book among other sources. > If two people are committing will it look like this (current revision = 99) > branch - bug001 : 100 (bug001-pre), 101, 103, 104, 107(bug001-post) > branch - bug002: 102, 106 > > And if that is the case, when I do a merge bug001 - bug002-post > will it ignore revisions 102 and 106? Subversion doesn't support complex (eg 3-way) merges, so you should merge 1 branch into another branch, typically in this scenario the bugfix branch (eg bugfix-001) back into the main branch (either the release branch if you did releases, or trunk). Once that's done, you can merge the next bugfix. -- John Paul Ashenfelter CTO/Transitionpoint (blog) http://www.ashenfelter.com (email) [EMAIL PROTECTED] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Macromedia ColdFusion MX7 Upgrade to MX7 & experience time-saving features, more productivity. http://www.adobe.com/products/coldfusion?sdid=RVJW Archive: http://www.houseoffusion.com/groups/CF-Talk/message.cfm/messageid:278146 Subscription: http://www.houseoffusion.com/groups/CF-Talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/cf_lists/unsubscribe.cfm?user=11502.10531.4
