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

Re: Merge from branch to trunk w/o switching

From: Stephen Connolly <stephen.alan.connolly_at_gmail.com>
Date: Mon, 13 Apr 2009 10:52:39 +0100

2009/4/13 Talden <talden_at_gmail.com>

> > suppose there are 2 developers each working on his own branch. From time
> to time a
> > feature in a branch is ready to be shared by all other developers.
>
> > The developer wants to merge the sources from branch to trunk. Since he
> is still working
> > on the branch he does not want to switch to trunk but simply merge from
> his (branch)
> > working copy to the trunk. Is it possible?
>
> > It seems that one has always to switch to trunk before you can merge from
> a branch?
>
> No as far as I am aware Subversion doesn't have this capability.
> Several other version control tools do support this (those that I know
> of being distributed version control tools).
>
> Conceptually, if it were certain that all changes on trunk had already
> been absorbed into the branch (using the same checks that merge
> reintegrate uses I expect), Subversion could probably collect the
> necessary information from the server to build the diffs necessary for
> a commit (whether it has the necessary out-of-date rules to cause the
> commit to fail if any change to trunk is made during the commit is
> something I don't know). I do know this feature somewhat goes against
> the spirit of Subversion (previewing the effect of changes locally
> before committing) so I doubt this will ever be supported.
>

Also if you did it this way you'd still face the problem of either marking
the branch as having been integrated or deleting the branch and re-creating
it... otherwise merge tracking would be fecked

-Stephen

>
> --
> Talden
>
> ------------------------------------------------------
>
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1684092
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_subversion.tigris.org].
>

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-13 11:54:38 CEST

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