If I focus on looking into what changed for only the file that I used for an example at the start of this thread, I see that its mergeinfo is wiped out and not DUAL_SSL_Inspection-mergeinfo-cleanup]$ grep ports/lsm/lsmclient/test/cukes/features/1_package_update Using wc -l to get a sense of how much change DUAL_SSL_Inspection-mergeinfo-cleanup]$ wc -l Ĩ374 DUAL_SSL_Inspection-mergeinfo-cleanup]$ wc -l ( I collected a `svn pg svn:mergeinfo` before and after the operation. ` in my branch, I wind up clearing out mergeinfo on 8000+ files: If I do the `svn propdel -R svn:mergeinfo svn revert. I really appreciate your help, but I'm still trying to comprehend.
#SUBVERSION REINTEGRATE SOFTWARE#
Software Dev / Routing Dude: Aries team, Roseville 916.785.2090 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. U DUAL_SSL_Inspection]$ svn stat DUAL_SSL_Inspection]$ svn DUAL_SSL_Inspection]$įYI, here is the view of mergeinfo from my trunk and trunk]$ svn propget svn:mergeinfo DUAL_SSL_Inspection]$ svn propget svn:mergeinfo DUAL_SSL_Inspection]$ Recording mergeinfo for merge of r19595 through r19596 into '.': accept postpone -r DUAL_SSL_Inspection]$ svn merge ^/6WINDGate/trunk. 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 DUAL_SSL_Inspection]$ svn merge ^/6WINDGate/trunk. 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/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 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 trunk]$ svn merge ^/6WINDGate/branches/DUAL_SSL_Inspection.
#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.
0 kommentar(er)
