Mercurial > hg
annotate 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 |
rev | line source |
---|---|
30941
354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
1 #if no-windows no-osx |
354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
2 |
354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
3 $ mkdir -p xdgconf/hg |
354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
4 $ echo '[ui]' > xdgconf/hg/hgrc |
354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
5 $ echo 'username = foobar' >> xdgconf/hg/hgrc |
354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
6 $ XDG_CONFIG_HOME="`pwd`/xdgconf" ; export XDG_CONFIG_HOME |
354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
7 $ unset HGRCPATH |
32429
7d8da7b54dc0
tests: hide warning from test-xdg.t
Durham Goode <durham@fb.com>
parents:
30941
diff
changeset
|
8 $ hg config ui.username 2>/dev/null |
30941
354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
9 foobar |
354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
10 |
354020079723
hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff
changeset
|
11 #endif |