Mercurial > evolve
view tests/testlib/push-checkheads-util.sh @ 6889:a66cf9008781
obslog: also display patch for rebased changesets
This applies the same logic that is used for "merge-diff" to rebased
changesets. The successors' content is compared to the content of the
predecessors rebased in-memory on the new parents.
This highlights the changes that were actually introduced while rebasing (like
conflict resolution or API adjustment).
As a side effect, obslog now also outputs slightly more diffs for splits,
showing what parts of the original big changeset were moved to the smaller
split components (but for now it only works for the first few changesets).
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 22 Sep 2024 02:58:54 +0200 |
parents | d1a6d83a7109 |
children |
line wrap: on
line source
# setup config and various utility to test new heads checks on push . $TESTDIR/testlib/common.sh cat >> $HGRCPATH <<EOF [ui] logtemplate = "{node|short} [{if(topic, fqbn, branch)}] ({phase}): {desc}\n" [phases] # non publishing server publish = False [extensions] # we need to strip some changeset for some test cases strip = evolve = EOF setuprepos() { echo creating basic server and client repo hg init server cd server mkcommit root hg phase --public . mkcommit A0 cd .. hg clone server client if [ "$1" = "single-head" ]; then echo >> "server/.hg/hgrc" "[experimental]" echo >> "server/.hg/hgrc" "# enforce a single name per branch" echo >> "server/.hg/hgrc" "single-head-per-branch = yes" fi }