Matthieu Moy <[EMAIL PROTECTED]> writes: > Mark Triggs <[EMAIL PROTECTED]> writes: > >> I thought I modified star-merge to do this by default too--?S to merge >> the current revision and M-u ?S to merge all of them. > > Not "merge the current revision" but "merge _up to_ the current > revision". > > star-merge will compute the common ancestor, and > > * apply all patches from that revision to the specified revision for a > normal merge > > * Call diff3 on that revision, your file, and the specified revision's > file for a --three-way merge. > > With tla replay, there's no notion of common ancestor. > > ,----[ http://wiki.gnuarch.org/moin.cgi/Tla_20Reference_2freplay ] > | If one or more specific revisions (including patch-levels) is > | specified instead, only those patch sets, and no others, will be > | applied. > `----
We should integrate that information to the docstrings of tla-revision-star-merge and tla-revision-replay -- Stefan.
