> I can do a manual UPDATE to bring each file in the working branch from trunk > ‘by hand’ but shouldn’t a MERGE take care of that also?
Strike that out. I talked without testing it first. This does not work, either. The file(s) reported as ‘not found’ From: Tony Papadimitriou Sent: Thursday, September 24, 2015 5:59 PM To: Fossil SCM user's discussion Subject: [fossil-users] MERGE problem I’m in some branch and doing a MERGE from trunk. Everything OK except for some newly added files on trunk that were not in the current branch, but a merge was expected to deal with them also. But, they do not ‘copy over’. The result is the project is incomplete as the updated files depend (#include) the missing ones. I can do a manual UPDATE to bring each file in the working branch from trunk ‘by hand’ but shouldn’t a MERGE take care of that also? Thanks. -------------------------------------------------------------------------------- _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
