RE: Merging / reintegration procedure

> 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
> branches/staging.
>
> I have three choices:
> 1) Merge changes from trunk into branches/staging. I have tried in
> branches/staging:
>
> svn merge --reintegrate http://[url]/trunk ./ --accept theirs-full

This in incorrect AFAIK. If you have copied from trunk to branches/staging and then later want to merge any changes that were committed to trunk after the copy was made the correct command would be:

svn merge http://path/to/repo/trunk

I'm also not sure why you would want to accept their full. You also never say, how do you get bug fixes from /staging back to trunk? I am a bit confused?

> 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.

You can sort of do that. Create a branches/beanstalk and create an external to branches/stagging pinned to a specific revision. Each time you are ready to deploy you can update the external and pin it to the correct revision in your staging branch.

But, I really think your work flow is a bit off and you are using reintegrate wrong... or I don't understand what you do because your description above is not complete in some way.

BOb

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2394748

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