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

Re: svn merge --reintegrate confusion

From: Mike Dixon <michael.dixon_at_denovosoftware.com>
Date: Wed, 25 Feb 2009 10:27:36 -0800

On 2/24/2009 5:37 PM, Mark Phippard wrote:
> On Tue, Feb 24, 2009 at 8:23 PM, Reid Priedhorsky<reid_at_umn.edu> wrote:
>> Or am I still missing something? Why would I want to apply the diff
>> between current trunk and current branch to the branch unless the branch
>> is fully up to date with respece to the trunk?
> You wouldn't, and it doesn't. I cannot explain the problem you have.
> Produce a reproduction script if you can and submit it.
>
Specifically, you wouldn't want to apply such a diff to the branch;
you'd want to apply it to *trunk*.

It does sound like you've got an incorrect assumption somewhere. As Mark
said, a reproduction script would be the best way to figure out what's
really going on here.

-Mike

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-25 19:28:38 CET

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