Rev 172: Modified test to step around issues with detecting which VCS a branch uses. in http://bzr.daniel-watkins.co.uk/pqm/merge-directives

[Daniel Watkins]

At http://bzr.daniel-watkins.co.uk/pqm/merge-directives

------------------------------------------------------------
revno: 172
revision-id: daniel at daniel-watkins.co.uk-20080709050758-758s3n21jwvc6b5o
parent: daniel at daniel-watkins.co.uk-20080709050209-tt5n5y1jd8grd89p
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: merge-directives
timestamp: Wed 2008-07-09 06:07:58 +0100
message:
  Modified test to step around issues with detecting which VCS a branch uses.
-------------- next part --------------
=== modified file 'tests/test-framework'
--- a/tests/test-framework	2008-07-09 05:02:09 +0000
+++ b/tests/test-framework	2008-07-09 05:07:58 +0000
@@ -489,8 +489,7 @@
   cd ${WORKDIR}/hello-world
   pqm_bzr rename hello-world.c hello_world.c
   pqm_bzr commit -m 'rename hello-world => hello_world.c'
-  pqm_bzr merge-directive --plain ${PQM_ARCHIVE_DIR}/hello-world/mainline/1.0\
-    . | submit_merge 'minor rename' "verify"
+  pqm_bzr merge-directive --plain ${PQM_ARCHIVE_DIR}/hello-world/mainline/1.0 `pwd` | submit_merge 'minor rename' "verify"
   endverbose
 }