Mercurial > hg
view tests/testlib/obsmarker-common.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 | 1858fc2327ef |
children | 86f39a89b63e |
line wrap: on
line source
mkcommit() { echo "$1" > "$1" hg add "$1" hg ci -m "$1" } getid() { hg log --hidden --template '{node}\n' --rev "$1" } cat >> $HGRCPATH <<EOF [alias] debugobsolete=debugobsolete -d '0 0' EOF