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

Merging / reintegration procedure

From: Alex <alex.liivid_at_gmail.com>
Date: Mon, 14 Sep 2009 12:17:29 -0700 (PDT)

Here is my branch structure
- trunk
- branches/staging
- branches/production

We do you primary development on trunk, and do bug fixes on staging.
When trunk is ready and stable, I want to merge all of those to
staging. Our deployment system (beanstalkapp.com) always deploys from

I have three choices:
1) Merge changes from trunk into branches/staging. I have tried in

svn merge --reintegrate http://[url]/trunk ./ --accept theirs-full

but this leaves diffs when I go the root and do:

 diff -r trunk/ branches/staging --exclude=.svn

2) Move branches/staging to branches/staging-[date/version] . Then
copy trunk to branches/staging.

3) Copy trunk go branches/staging-[date/version], then update our
deployment system to deploy from the new branch.

I have been doing (2), but I don't really like it. (1) seems to
better keep track of revisions, but I'm willing to accept that might
be wrong.

Ideally subversion would support some type of "symbolic link". I
could have branches/staging-v1.3 and branches/staging could be a
symbolic link there. This would allow the deployment system to not
need to be updated every time.

Any thoughts?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-14 21:21:53 CEST

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.