Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
.arcconfig
author Martin von Zweigbergk <martinvonz@google.com>
Sat, 27 Apr 2019 23:30:19 -0700
changeset 42213 618b9ffefa87
parent 33583 b2c27d84f05c
child 44128 ff396501e841
permissions -rw-r--r--
tests: demonstrate that rename is followed to wrong parent from merge This test case shows another way that copies are handled differently between `hg st` (pathcopies()) and `hg co -m` (mergecopies). The reason is that pathcopies() calls _tracefiles(), which checks that the file nodeid of an ancestor matches the file nodeid in the base commit. mergecopies() should probably be doing the same. Differential Revision: https://phab.mercurial-scm.org/D6323
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
33583
b2c27d84f05c phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff changeset 
     1
 
{
b2c27d84f05c phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff changeset 
     2
 
    "conduit_uri": "https://phab.mercurial-scm.org/api",
b2c27d84f05c phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff changeset 
     3
 
    "repository.callsign": "HG",
b2c27d84f05c phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff changeset 
     4
 
    "arc.land.onto.default": "@",
b2c27d84f05c phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff changeset 
     5
 
    "base": "hg:.^"
b2c27d84f05c phabricator: include the suggested arc config in the repo
Alex Gaynor <agaynor@mozilla.com>
parents:
diff changeset 
     6
 
}
Mercurial