Mercurial > hg
view tests/test-xdg.t @ 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 | 7d8da7b54dc0 |
children | a4b3b8dee0a8 |
line wrap: on
line source
#if no-windows no-osx $ mkdir -p xdgconf/hg $ echo '[ui]' > xdgconf/hg/hgrc $ echo 'username = foobar' >> xdgconf/hg/hgrc $ XDG_CONFIG_HOME="`pwd`/xdgconf" ; export XDG_CONFIG_HOME $ unset HGRCPATH $ hg config ui.username 2>/dev/null foobar #endif