Tue, 19 Jun 2012 18:05:23 +0200 obsolete: handle rebase --collapse
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 18:05:23 +0200] rev 282
obsolete: handle rebase --collapse Recording obsolete in concludenode() did not work for --collapse because only the first revision was passed to the call. The new strategy is to track the rebase state in defineparents() and concludenode() and to create markers only after a successful non-abort call. In theory, this should also fix --continue/--abort cases. The change in test-stabilize-order.t comes from concludenode() no longer creating obsolete marker. stabilize command was actually duplicating markers, once in concludenode(), once explicitely.
Tue, 19 Jun 2012 17:05:39 +0200 test-stabilize-order.t: trace obsolete markers
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 17:05:39 +0200] rev 281
test-stabilize-order.t: trace obsolete markers Will prevent breakage in rebase.concludenode() overriding.
Tue, 19 Jun 2012 14:02:12 +0200 test-obsolete-rebase.t: move --keep test from test-obsolete.t
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 14:02:12 +0200] rev 280
test-obsolete-rebase.t: move --keep test from test-obsolete.t
Tue, 19 Jun 2012 18:02:34 +0200 obsolete: handle rebase removing empty changesets
Patrick Mezard <patrick@mezard.eu> [Tue, 19 Jun 2012 18:02:34 +0200] rev 279
obsolete: handle rebase removing empty changesets The new revision identifier returned by concludenode() was None and was not correctly translated to nullid.
(0) -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 tip