H.C. Chen schrieb: >> you are content with its state. Then you simply merge your >> private branch back onto your "trunk" > > When being content with the private thread's state, I am standing on the > private thread. So, > > fossil merge <trunk-commit-id> > fossil ci -m "Still private <==== Problem!!" > > > > is still standing on the private thread. I cann't find any merge command > option to merge it *back onto* the trunk. Please show me exactly how to do > it. Thanks !
Ah ... in Fossil you are merging *from* somewhere *into* the current checkout all the time! If you have a look onto fossil merge --help you will read: Usage: fossil merge ?OPTIONS? VERSION The argument VERSION is a version that should be merged into the current checkout. (...) So that meant, as soon as you are content with you private branch, you have to switch to the trunk (or whatever your target is, via fossil update trunk and then merge your private branch into the trunk via fossil merge <private-branch-commit-id> . Check the changes, resolve any conflict and if you content with your result, commit it back onto trunk ... That's all about ... Happy fossil'ing, chi :-) _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
