comparison tests/test-tutorial.t @ 269:6c6bb7a23bb5 0.1.0

stabilize: improve unstable selection heuristic Without argument, stabilize was picking the first in: "unstable() and ((suspended() or obsancestors(::.))::)" which usually returned the "oldest" unstable revision in parent predecessors descendants. This revision is interesting because it usually gives "soft" merges but rebasing it left the working directory on a remote branch, which was very confusing. The new heuristic picks an unstable changeset which can be rebased on top of the parent revision, or on top of one of its descendants (selected in revision order). This has the advantage of selecting a revision which can be rebased on the current subtree, and leave the working directory in a more convenient location.
author Patrick Mezard <patrick@mezard.eu>
date Wed, 13 Jun 2012 18:28:10 +0200
parents 92b073d13f2d
children d702f0d26c6a
comparison
equal deleted inserted replaced
268:2da5af3dadeb 269:6c6bb7a23bb5