Mercurial > hg
changeset 28082:db90cb1e89c8
bookmarks: avoid creating a nested repository during testing
This helps the test to pass with hgwatchman, which would otherwise need to be
taught about a nested .hg directory. hgwatchman already blacklists
test-nested-repo.t which covers the actual usecase
| author | Martijn Pieters <mjpieters@fb.com> |
|---|---|
| date | Fri, 12 Feb 2016 14:24:48 +0000 |
| parents | a6344df5108e |
| children | 550097d01ca3 |
| files | tests/test-bookmarks-pushpull.t |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-bookmarks-pushpull.t Mon Feb 08 15:35:30 2016 -0800 +++ b/tests/test-bookmarks-pushpull.t Fri Feb 12 14:24:48 2016 +0000 @@ -680,12 +680,12 @@ pushing an existing but divergent bookmark with -B still requires -f - $ hg clone -q . r + $ hg clone -q . ../r $ hg up -q X $ echo 1 > f2 $ hg ci -qAml - $ cd r + $ cd ../r $ hg up -q X $ echo 2 > f2 $ hg ci -qAmr @@ -696,7 +696,7 @@ abort: push creates new remote head 54694f811df9 with bookmark 'X'! (pull and merge or see "hg help push" for details about pushing new heads) [255] - $ cd .. + $ cd ../addmarks Check summary output for incoming/outgoing bookmarks