I've got a branch containing brand new code. Branch name: /Coupons Files: /com/Coupons/coupons.cfc
That's all that's in the branch, and neither the folder (or file) exists in the trunk. The branch creation revision was 242, and I want to merge all changes from 242 through 329. - I make sure my working repo is the trunk. - I bring up the merge window. - Under From: I change the from dropdown to the branch - Under From: I click the revision radio button, type in 242. - Under To: I click the head revision radio button When I run either a dry run, OR a full merge, I get the following message: merge -r242:HEAD http://[url redacted]/com_protected/branches/Coupons C:/Program Files/Apache Group/Apache2/htdocs/dealerskins/com Skipped C:/Program Files/Apache Group/Apache2/htdocs/dealerskins/com/Coupons/coupons.cfc Skipped C:/Program Files/Apache Group/Apache2/htdocs/dealerskins/com/Coupons C C:/Program Files/Apache Group/Apache2/htdocs/dealerskins/com/utils/CommonFunctions.cfc Merge complete. ===== File Statistics: ===== Conflicts: 1 Does anyone have any idea why it keeps skipping this one file? It's 100% certainly not there in my working code. I've merged before successfully, and never had this problem. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Adobe® ColdFusion® 8 software 8 is the most important and dramatic release to date Get the Free Trial http://ad.doubleclick.net/clk;203748912;27390454;j Archive: http://www.houseoffusion.com/groups/CF-Talk/message.cfm/messageid:312912 Subscription: http://www.houseoffusion.com/groups/CF-Talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/cf_lists/unsubscribe.cfm?user=89.70.4
