On 20/09/15 21:16, David Given wrote: [...] > How do I do this? fossil merge won't touch it because my two branches > don't share an ancestor. If I force it using --baseline with any of the > obvious revisions it just does crazy things.
As an addendum: fossil merge --cherrypick *almost* does what I want, if a bit cumbersomely --- I cherrypick each revision of my new branch into my target branch, one at a time. Unfortunately it looks like --cherrypick doesn't work on the first revision of the new branch: $ fossil merge --cherrypick 8cd9ac7b13 cannot find an ancestor for 8cd9ac7b13 That's definitely a bug. A missing ancestor should be considered an empty checkin in this context. -- ┌─── ｄｇ＠ｃｏｗｌａｒｋ．ｃｏｍ ───── http://www.cowlark.com ───── │ "There is nothing in the world so dangerous --- and I mean *nothing* │ --- as a children's story that happens to be true." --- Master Li Kao, │ _The Bridge of Birds_
signature.asc
Description: OpenPGP digital signature
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
