Richard Hipp wrote: [...] > Note that the "merge" command also includes the --baseline option. The > --baseline option can identify the start of a sequence of checkins that > you want to merge. Suppose there are some sequence of changes in > another branch A->B->C->D. If you do "fossil merge D --baseline A", > that would be the equivalent of doing three separate cherry-pick merges > of B, C, and D, in that order.
Is this suitable for doing rewind/replay style modifications for, e.g., editing revision history? e.g. if I have A->X->B->C->D, and want to edit X, would I: - checkout A; - merge X with a different checkin comment; - merge D with a baseline of X? (I'm intending to end up with: A->X->B ->C ->D (closed) \-Y->B'->C'->D' .) -- ┌─── ｄｇ＠ｃｏｗｌａｒｋ．ｃｏｍ ───── http://www.cowlark.com ───── │ "Parents let children ride bicycles on the street. But parents do not │ allow children to hear vulgar words. Therefore we can deduce that │ cursing is more dangerous than being hit by a car." --- Scott Adams _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
