packaging: rename hgrc.d to defaultrc for Windows config files next to the exe The code and the help still says that it will read hgrc.d next to the executable. But this directory needs to exist to read the resource based config files. Otherwise even `hg version` errors out: $ /c/Program\ Files/Mercurial/hg.exe version Traceback (most recent call last): File "hg", line 43, in <module> File "mercurial\dispatch.pyc", line 110, in run File "mercurial\dispatch.pyc", line 226, in dispatch File "mercurial\ui.pyc", line 308, in load File "mercurial\rcutil.pyc", line 99, in rccomponents File "mercurial\rcutil.pyc", line 69, in default_rc_resources File "mercurial\utils\resourceutil.pyc", line 84, in contents WindowsError: [Error 3] The system cannot find the path specified: 'c:\\Program Files\\mercurial\\defaultrc\\*.*' Differential Revision: https://phab.mercurial-scm.org/D7981

     1

Test for changeset ba7c74081861

     2

(update dirstate correctly for non-branchmerge updates)

     3

  $ hg init a

     4

  $ cd a

     5

  $ echo a > a

     6

  $ hg add a

     7

  $ hg commit -m a

     8

  $ cd ..

     9

  $ hg clone a b

    10

  updating to branch default

    11

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    12

  $ cd a

    13

  $ hg mv a b

    14

  $ hg commit -m move

    15

  $ echo b >> b

    16

  $ hg commit -m b

    17

  $ cd ../b

    18

  $ hg pull ../a

    19

  pulling from ../a

    20

  searching for changes

    21

  adding changesets

    22

  adding manifests

    23

  adding file changes

    24

  added 2 changesets with 2 changes to 1 files

    25

  new changesets e3c9b40284e1:772b37f1ca37

    26

  (run 'hg update' to get a working copy)

    27

  $ hg update

    28

  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

    29

    30

  $ cd ..