[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: marc gonzalez-carnicer <carnicer.lists_at_gmail.com>
Date: Wed, 29 Apr 2009 18:09:57 +0200

My post was also in Todd's direction. Although Bob's and MarkP's
suggestion is interesting, I was referring to cases as where one
doesn't want to use mergeinfo, or perhaps can't, because of say, a
pre-1.5 server. Being allowed to migrate may not be trivial (my
case).

2009/4/29 Gleason, Todd <tgleason_at_impac.com>:
>> -----Original Message-----
>> From: Bob Archer [mailto:Bob.Archer_at_infor.com]
>> Sent: Wednesday, April 29, 2009 8:39 AM
>> To: Gleason, Todd; marc gonzalez-carnicer; users_at_subversion.tigris.org
>> Subject: RE: merge --exclude-revisions
>>
>> > 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
>
> I see some posts under
> http://subversion.open.collab.net/ds/viewMessage.do?dsForumId=4&dsMessag
> eId=99732 that appear to explain this, though I don't understand them
> well enough to trust that I'd do the right thing in this scenario.
> (Mostly what I read in that thread talked about keeping the branch in
> sync with the trunk, whereas I think more in terms of cherry-picking
> changes from the trunk that are needed to make progress in the branch,
> and just not wanting them merged back to the trunk...so I'm not sure
> whether to record-only in the trunk or the branch, and if so, what
> exactly to record.)
>
> In any case, there are other uses for this scenario anyway.  Maybe you
> have other reasons not to want specific revisions (perhaps they
> introduce instability and you need further changes in the branch before
> merging these to the trunk).  So I still think it sounds useful, though
> I'm sure there are plenty of higher-priority features on the table.
>

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-29 18:10:58 CEST

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