[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

Re: [fossil-users] MERGE problem

> 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:

Re: [fossil-users] MERGE problem

On 9/24/15, Tony Papadimitriou wrote: > 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

Re: [fossil-users] MERGE problem

Is there a chance that these are files you previously deleted from a branch? For example: 1. Create branch from trunk. 2. Deleted files from branch and committed. 3. Made changes to files on trunk and committed. 4. Merged from trunk expecting the changed files to come into branch. There are