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

RE: merge --exclude-revisions

From: Bob Archer <Bob.Archer_at_infor.com>
Date: Wed, 29 Apr 2009 10:38:44 -0400

> A similar thought had crossed my mind some time back as well. I think
> that one use would be that if you were merging back and forth between
> branch and trunk (and did not want to reintegrate, delete the branch,
> and then re-create it), that you excluded the trunk->branch merges when
> you merged from branch->trunk.

You can do this by doing a --record-only merge to set the merge properties on the branch so it will ignore the reinteration merge revisions commited to the trunk. This way you can use --reintegrate and let svn do all the work on determining what revs to merge.

Mark P has posted about this several times. I give him all the credit for this information.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-29 16:40:01 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.