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

Re: Merging / reintegration procedure

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

Thanks for your answers.

Since major refactoring is going on in the trunk, changes are
backported by hand, not using svn merge. My understanding of
reintegrate (apparently wrong, but based on some research) is that
after re-integrate, there should be no diffs.

The reason for accepting all changes from trunk is that all changes
have been backported and the trunk is considered stable. We do not
want any changes from the old staging branch sticking around. Simply
going to staging and doing an svn merge will leave me dealing with
conflicts and potentially diffs since the backport is not always the
same as the original change.

Perhaps my #2 or #3 options are appropriate under these circumstances.

On Sep 14, 12:17 pm, Alex <alex.lii..._at_gmail.com> wrote:
> 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  --reintegratehttp://[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?
> Thanks.
> ------------------------------------------------------http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessa...
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_subversion.tigris.org].


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-14 21:54:02 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.