Reply: Andreas Stieger: "Re: reintegrate merge failing because "can only be used if revisions were previously merged", but it's a lie (I think?)".Next in thread: Andreas Stieger: "Re: reintegrate merge failing because "can only be used if revisions were previously merged", but it's a lie (I think?)".Previous message: Daniel Shahaf: "Re: Obtaining log messages for a diff".Next message: Andreas Stieger: "Re: reintegrate merge failing because "can only be used if revisions were previously merged", but it's a lie (I think?)".
#Subversion reintegrate software
Software Dev / Routing Dude: Aries team, Roseville CA
In summary, A recent merge from trunk to branch suceeded, trunk cannot reintegrate because it claims that some change sets are not merged to branch, attempts to merge those exact change sets into branch produce a no-op, mergeinfo on branch confirms those change sets are missing. Notice that 19595 is, infact, missing from branch's mergeinfo. 6WINDGate/branches/zorro_trunk_merge/ports/lsm/lsmclient/test/cukes/features/1_package_update:21398-23471 $ svn propget svn:mergeinfo ports/lsm/lsmclient/test/cukes/features/1_package_update $įYI, here is the view of mergeinfo from my trunk and branch: Recording mergeinfo for merge of r19595 through r19596 into '.': Furthermore, if I go into my branch working copy and attempt to merge an exact change (let me pick revision 19595 as an example because it's first in the listing above), nothing happens: that's a bit hard to believe because I did just recently merge trunk to branch. Missing ranges: /6WINDGate/trunk/user/switch/sdk-xgs-robo-6.4.0/systems/linux/user/constellation-2_6:17549 Missing ranges: /6WINDGate/trunk/user/switch/sdk-xgs-robo-6.4.0/systems/linux/kernel/constellation-2_6:17549,18282ĦWINDGate/branches/DUAL_SSL_Inspection/user/switch/sdk-xgs-robo-6.4.0/systems/linux/user/constellation-2_6 Missing ranges: /6WINDGate/trunk/ports/xtrap/scripts:21872ĦWINDGate/branches/DUAL_SSL_Inspection/user/switch/sdk-xgs-robo-6.4.0/systems/linux/kernel/constellation-2_6 Missing ranges: /6WINDGate/trunk/ports/lsm/lsmclient/test/cukes/features/1_package_update:19595ĦWINDGate/branches/DUAL_SSL_Inspection/ports/xtrap/scripts Svn: E195016: Reintegrate can only be used if revisions 15725 through 26003 were previously merged from to the reintegrate source, but this is not the case:ĦWINDGate/branches/DUAL_SSL_Inspection/ports/lsm/lsmclient/test/cukes/features/1_package_update $ svn merge ^/6WINDGate/branches/DUAL_SSL_Inspection. I like the branch.įrom within an up-to-date trunk working copy, if I attempt the merge branch back to trunk I get some complaints:
#Subversion reintegrate verification
It passes verification and sanity testing. I have recently (like yesterday) merged trunk to branch successfully. I have subversion 1.8 on both server and client (though a year ago, we were using 1.6 server and client). Time has come (it was long, over a year) to reintegrate back into trunk.