Thus said to...@acm.org on Sat, 30 May 2015 01:29:10 +0300: > And, using --force does nothing, of course.
Actually, it does. Did you try to run ``fossil ci'' after running ``fossil merge --force'' to actually commit your changes? There will be no files changed as part of the merge, but it will certainly merge the two leaves and it should show up in your timeline. > As for closing the older trunk, I thought about it, but I'm not sure > in what ways it would affect the operation of the various fossil > commands? That's a good question. That particular leaf will no longer show up in the open leaves report. It will not be possible to commit changes against the closed leaf (without a bit of extra work). Not sure what else might be implied here. > Would they treat it the same as before, or because it's close it would > be considered differently, e.g., being excluded from certain reports, > etc.? It would certainly cease to be listed as a fork. Andy -- TAI64 timestamp: 400000005568ef5b _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
