HI, I'm having a branch which I integrate to trunk time after time. It's just one directory from trunk, not the whole trunk. Also I sometimes want to integrate this directory from trunk to the branch. However this ended up recently with the following error:
sr@cocaine:~/_work/_repo/swmagi2_merge/C_Test/SC_OAM/SWM_SoftwareManagement$ svn merge https://wrisop30.emea.nsn-net.net/isource/svnroot/BTS_SC_OAM/WCDMA/trunk/C_Test/SC_OAM/SWM_SoftwareManagement svn: E195016: Reintegrate can only be used if revisions 171446 through 172049 were previously merged from https://wrisop30.emea.nsn-net.net/isource/svnroot/BTS_SC_OAM/WCDMA/branches/development/swmagi2/C_Test/SC_OAM/SWM_SoftwareManagementto the reintegrate source, but this is not the case: WCDMA/trunk/C_Test/SC_OAM/SWM_SoftwareManagement Missing ranges: /WCDMA/trunk/C_Test/SC_OAM/SWM_SoftwareManagement:171530,171551,171573,171583 WCDMA/trunk/C_Test/SC_OAM/SWM_SoftwareManagement/MT Missing ranges: /WCDMA/trunk/C_Test/SC_OAM/SWM_SoftwareManagement/MT:171530 WCDMA/trunk/C_Test/SC_OAM/SWM_SoftwareManagement/MT/test_cases/FSMr2 Missing ranges: /WCDMA/trunk/C_Test/SC_OAM/SWM_SoftwareManagement/MT/test_cases/FSMr2:171530 So I've tried to do what SVN suggested and merge missing revisions from branch to trunk: sr@cocaine:~/_work/_repo/trunk2/C_Test/SC_OAM/SWM_SoftwareManagement$ svn merge -c 171530 https://wrisop30.emea.nsn-net.net/isource/svnroot/BTS_SC_OAM/WCDMA/branches/development/swmagi2/C_Test/SC_OAM/SWM_SoftwareManagement --- Recording mergeinfo for merge of r171530 into '.': U . sr@cocaine:~/_work/_repo/trunk2/C_Test/SC_OAM/SWM_SoftwareManagement$ svn st -q sr@cocaine:~/_work/_repo/trunk2/C_Test/SC_OAM/SWM_SoftwareManagement$ And as you can see something very strange happens. SVN says that it updated mergeinfo on the SWM_SoftwareManagement directory, but svn st says that there are no modifications! So I am not able to commit this change of mergeinfo and fix the problem. How can I resolve this issue apart from deleting the branch and creating it again (this way I will loose history). Is it possible to manually set mergeinfo using propset? Is it really the only option here?
