# HG changeset patch # User Pierre-Yves David # Date 2015-05-10 10:06:00 # Node ID 00e4c5601c7491e94837347c374eb01bf065e3d8 # Parent bd625cd4e5e7c415007257c3545e2db4ffe1a8f9 test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t' The locking scheme is a bit different in each cases. So we explicitly test each case. diff --git a/tests/test-push-hook-lock.t b/tests/test-push-hook-lock.t --- a/tests/test-push-hook-lock.t +++ b/tests/test-push-hook-lock.t @@ -26,7 +26,7 @@ $ echo bar >> 3/foo $ hg --cwd 3 ci -m bar - $ hg --cwd 3 push ../2 + $ hg --cwd 3 push ../2 --config experimental.bundle2-exp=False pushing to ../2 searching for changes adding changesets @@ -36,3 +36,15 @@ lock: user *, process * (*s) (glob) wlock: free + $ hg --cwd 1 --config extensions.strip= strip tip -q + $ hg --cwd 2 --config extensions.strip= strip tip -q + $ hg --cwd 3 push ../2 --config experimental.bundle2-exp=True + pushing to ../2 + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files + lock: user *, process * (*s) (glob) + wlock: user *, process * (*s) (glob) +