comparison tests/test-double-merge.t @ 17613:aafc521668d8

rebase: properly handle --collapse when creating obsolescence marker In collapse mode, that content of state is not suitable to compute obsolescence markers. We explicitly pass the resulting revision instead and use it as the successors for all elements of the rebased set.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 18 Sep 2012 23:42:27 +0200
parents f2719b387380
children a6fe1b9cc68f
comparison
equal deleted inserted replaced
17612:fc2a6114f0a0 17613:aafc521668d8