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

Merging Two Different Trees skips some revisions?

From: Judson Wilson <judson_at_powerstandards.com>
Date: Wed, 18 May 2011 10:32:12 -0700

I am merging a branch back into the trunk using the "Merging Two
Different Trees" method, and it mostly seems to work, and without any
conflicts.

However, when I go inspecting the modifications, it appears that the
last N number of changesets on the trunk are not applied. It appears to
stop at a change-set where I merged in a single revision from the same
branch to the trunk.

Any ideas what might be going on here?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2740742

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-18 19:34:33 CEST

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