Mercurial > hg
view tests/testlib/push-checkheads-util.sh @ 40190:31dfa7dac4c9
absorb: prompt user to accept absorb changes by default
Change the default absorb behaviour to print the changes out and then prompt
the user if they want to absorb the changes or not.
Providing the `-p` option still prints the result and exits. A new `-a` option
is provided which applies the changes without printing them, giving the
equivalent of the old behaviour.
Differential Revision: https://phab.mercurial-scm.org/D4999
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Fri, 12 Oct 2018 17:48:40 +0000 |
parents | 36006e014deb |
children | ed84a4d48910 |
line wrap: on
line source
# setup config and various utility to test new heads checks on push cat >> $HGRCPATH <<EOF [ui] # simpler log output logtemplate ="{node|short} ({phase}): {desc}\n" [phases] # non publishing server publish=False [extensions] # we need to strip some changeset for some test cases strip= [experimental] # enable evolution evolution=all [alias] # fix date used to create obsolete markers. debugobsolete=debugobsolete -d '0 0' EOF mkcommit() { echo "$1" > "$1" hg add "$1" hg ci -m "$1" } getid() { hg log --hidden --template '{node}\n' --rev "$1" } 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 }