Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: Merging Two Different Trees skips some revisions?

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Hide all messages in topic

All messages in topic

Re: Merging Two Different Trees skips some revisions?

Author Judson Wilson <judson at powerstandards dot com>
Full name Judson Wilson <judson at powerstandards dot com>
Date 2011-05-18 10:40:49 PDT
Message Sorry, I should mention:

TortoiseSVN 1.6.15, Build 21041 - 32 Bit , 2011/03/23 18:00:27
Subversion 1.6.16,
apr 1.3.8
apr-utils 1.3.9
neon 0.29.5
OpenSSL 1.0.0d 8 Feb 2011
zlib 1.2.5

Merging Two Different Trees skips some revisions?

Author Judson Wilson <judson at powerstandards dot com>
Full name Judson Wilson <judson at powerstandards dot com>
Date 2011-05-18 10:32:14 PDT
Message 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?
Messages per page: