Mercurial > hg
view tests/testlib/push-checkheads-util.sh @ 34552:33c8a6837181
merge: check for path conflicts when updating (issue5628)
When updating to a new revision, check for path conflicts caused by unknown
files in the working directory, and handle these by backing up the file or
directory and replacing it.
Differential Revision: https://phab.mercurial-scm.org/D781
author | Mark Thomas <mbthomas@fb.com> |
---|---|
date | Mon, 02 Oct 2017 14:05:30 -0700 |
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 }