branching: merge stable back into default
authorPierre-Yves David <pierre-yves.david@octobus.net>
Tue, 16 Jan 2018 04:32:43 +0100
changeset 3417 d3a17c67f85c
parent 3409 740e1267be6f (current diff)
parent 3416 bf6b859807ba (diff)
child 3423 e21b4f3b32c1
branching: merge stable back into default The test change has to be reverted.
tests/test-discovery-obshashrange.t
tests/test-divergent.t
tests/test-evolve-obshistory-complex.t
tests/test-evolve-obshistory.t
tests/test-evolve-order.t
tests/test-evolve-phase.t
tests/test-evolve-split.t
tests/test-evolve-templates.t
tests/test-evolve-topic.t
tests/test-evolve.t
tests/test-exchange-obsmarkers-case-A4.t
tests/test-exchange-obsmarkers-case-B5.t
tests/test-issue-5720.t
tests/test-obsolete.t
tests/test-push-checkheads-partial-C2.t
tests/test-push-checkheads-partial-C4.t
tests/test-sharing.t
tests/test-stabilize-conflict.t
tests/test-stabilize-order.t
tests/test-stabilize-result.t
tests/test-stack-branch.t
tests/test-topic-change.t
tests/test-topic-debugcb.t
tests/test-topic-stack-complex.t
tests/test-topic-stack-data.t
tests/test-topic-stack.t
tests/test-topic-tutorial.t
tests/test-touch.t
tests/test-tutorial.t
tests/test-uncommit.t
tests/test-unstable.t
tests/test-userguide.t
tests/test-wireproto.t