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

Re: [Subclipse-users] merging between trunk and a branch and visa versa..

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 19 Feb 2010 08:34:41 -0800

This is a core Subversion issue and the same reason that drives the
need for the reintegrate option:


You can use the Block option to record the revision on your branch,
but as you indicate it is something you have to know to do and do


On Fri, Feb 19, 2010 at 8:04 AM, jcompagner <jcompagner_at_gmail.com> wrote:
> Hi,
> Dont know if this is a subclipse/merge client thing or a subversion thing
> itself
> So i will just ask it here.
> Most of the time if i make a change i know upfront ok that should be first
> in the branch and then i merge it to trunk
> But there are also other times that i first do it on trunk and then later on
> its decided ok thats tested and should also go into the branch.
> But if you merge like this both ways.
> Then i find it a bit confusing (and i constantly have to remember it and
> check it again) that a merge of revision 10 from trunk to branch.
> Is again in the list of things to merge, if i merge from branch to trunk
> then i see revision 20 from branch (which is the merge of 10 from trunk)
> Cant the merge client or subversion not see this for me? And not show me
> those options that are already in trunk because that was the original code?
> More like a auto block revision on trunk when i do the merge in/on branch.
> (i know this is not possible because you cant of course change trunk when
> you are working/merging in branch)
> But i think when i ask i want to the branch url for the revisions it should
> try to look in the merge properties of that url/project and see that there
> are the merge properties of those revisions and that filter them out for me.
> johan

Mark Phippard
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-02-19 17:34:49 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.