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

Re: Fwd: svn1.5 seems to fail simple merge-tracking scenario

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 20 Feb 2009 16:38:22 -0500

On Fri, Feb 20, 2009 at 4:36 PM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
>> > that revision in the branch. Now I make more changes in the branch
> and
>> > never make any more changes on the commit.
>>
>> The last sentence doesn't parse. I think what you were trying to say
>
> Sorry, I should really read my messages before I send.
>
> I meant to say:
>
> So, lets say r100 was your commit as your example showed. I record-only
> that revision in the branch. Now I make more changes in the branch and
> never make any more changes on the trunk.
>
> I am assuming I would be good based on your response.

Yes, that would be fine. Unfortunately, even in that scenario you do
still need to use the --record-only option though. It seems like a
second --reintegrate would work, but it doesn't because it does not
know to use the newer trunk revision as the base for the diff.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1200638
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-20 22:39:25 CET

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