Mercurial > hg
view tests/test-issue619.t @ 35066:57d56f603f70
run-tests: fix TESTDIR if testdescs are absolute paths
Commit a18eef03d879 made TESTDIR be the location of the arguments that were
passed to run-tests.py instead of just PWD. It assumed that these tests were
specified using relative paths, so if pwd was /tmp/foo, and the first argument
was /tmp/baz, it would set TESTDIR to /tmp/foo//tmp/baz.
Differential Revision: https://phab.mercurial-scm.org/D1433
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Wed, 15 Nov 2017 17:54:27 -0800 |
parents | 2fc86d92c4a9 |
children | 55c6ebd11cb9 |
line wrap: on
line source
https://bz.mercurial-scm.org/619 $ hg init $ echo a > a $ hg ci -Ama adding a $ echo b > b $ hg branch b marked working directory as branch b (branches are permanent and global, did you want a bookmark?) $ hg ci -Amb adding b $ hg co -C 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved Fast-forward: $ hg merge b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg ci -Ammerge Bogus fast-forward should fail: $ hg merge b abort: merging with a working directory ancestor has no effect [255] Even with strange revset (issue4465) $ hg merge ::. abort: merging with a working directory ancestor has no effect [255]