Merging and Skipped missing target:
This is more a best practice question (I think)
In the scenario below, trunk will always reflect what is currently running on Production. devel_branch is the main line of development and the release_branch is ready to go to QA/Production. The release_branch is a copy of the devel_branch plus any fixes that were picked up at QA.
When everything is hunky dory, I merge the release_branch into the trunk and devel_branch.
In this scenario, though, I have either deleted or renamed a file on the devel_branch but I have also made changes to that same file on the release_branch.
Naturally, when I come to merge into the devel_bramch, svn tells me .... Skipped missing target: 'private/pri_file1.pl' . But everything is fine with regards to the trunk.
What should I do in this situation coz my branches are now a bit inconsistent?
Many
thanks
-Ants
trunk r2 ____ r5 (copy to devel_branch)
devel_branch r6 ____ r7 (copy to release_branch) ------------r23
release_branch r8 ----- r17
cd devel_branch
svn merge --dry-run -r8:17 ../release_branch2
U protected/pro_file1.pl
U protected/pro_file2.pl
U protected/pro_file3.pl
Skipped missing target: 'private/pri_file1.pl'
U private/pri_file2.pl
U private/pri_file3.pl
U public/pub_file1.pl
Disclaimer: Technically, I'm always wrong!! |
Yahoo! for Good helps you make a difference
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on 2008-04-06 10:29:51 CEST
|
|