Hi,

This is probably a trivial question, but I can't find a clear answer
in the documentation.
I have a repository at

http://kuu.se/fossil/b64.cgi/timeline

with two branches, trunk and c-stdin
In c-stdin, I created the file b64.c, which does not exist in trunk.
Some other files, created beforehand in trunk, were modified in c-stdin.
The changes in c-stdin were then merged into trunk, as seen in

http://kuu.se/fossil/b64.cgi/info/4e0d851bb88275cf056686c4c3e161bee84647ea

In this case, b64.c was not merged into trunk.
Of course I could have simply add an empty file named b64.c in trunk
before merging, but I don't think that is the way to do this
correctly.
In this case we are talking about one single file, which makes it easy
to do manually.
But what if there were thousands of files in each branch?
I am looking for an option similar to:

fossil update trunk
fossil merge c-stdin --include-missing-files

Sorry if I am missing something trivial in the documentation.
Any suggestions appreciated.

Regards,
Johan
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to