You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Anthony Gardner <cy...@yahoo.co.uk> on 2008/04/06 08:29:16 UTC
Merging and Skipped missing target:
<table cellspacing='0' cellpadding='0' border='0' ><tr><td style='font: inherit;'>This is more a best practice question (I think)<br><br>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.<br><br>When everything is hunky dory, I merge the release_branch into the trunk and devel_branch.<br><br>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.<br><br>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.<br><br>What should I do in this situation coz my branches are now a bit inconsistent?<br><br>Many
thanks<br><br>-Ants<br><br>trunk r2 ____ r5 (copy to devel_branch)<br> devel_branch r6 ____ r7 (copy to release_branch) ------------r23<br> release_branch r8 ----- r17<br><br>cd <span style="font-weight: bold;">devel_branch</span><br><br>svn merge --dry-run -r8:17 ../release_branch2<br>U protected/pro_file1.pl<br>U protected/pro_file2.pl<br>U protected/pro_file3.pl<br>Skipped missing target: 'private/pri_file1.pl'<br>U private/pri_file2.pl<br>U private/pri_file3.pl<br>U public/pub_file1.pl<br><br>Disclaimer: Technically, I'm always wrong!!</td></tr></table><br>
<hr size=1>
Yahoo! for Good helps you <a href="http://us.rd.yahoo.com/mailuk/taglines/isp/control/*http://us.rd.yahoo.com/evt=51947/*http://uk.promotions.yahoo.com/forgood/">make a difference</a>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org