# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 2012-06-26 10:17:40
# Node ID 75fd9d1cf6389ae86961764b8df437eb36f3515d
# Parent  f8af57c00a29cb52c7561fad1f7ab2d9e68b96cf

convert/bzr: make tests work with bzr 2.0 again

bzr ci --commit-time was introduced in 2.1
bzr add without -q prints "adding" in 2.1, "added" in 2.0

diff --git a/tests/test-convert-bzr.t b/tests/test-convert-bzr.t
--- a/tests/test-convert-bzr.t
+++ b/tests/test-convert-bzr.t
@@ -215,25 +215,23 @@ Multiple branches
   $ bzr co repo/trunk repo-trunk
   $ cd repo-trunk
   $ echo a > a
-  $ bzr add a
-  adding a
-  $ bzr ci -qm adda --commit-time '2012-01-01 00:00:01 +0000'
+  $ bzr add -q a
+  $ bzr ci -qm adda
   $ bzr tag trunk-tag
   Created tag trunk-tag.
   $ bzr switch -b branch
   Tree is up to date at revision 1.
   Switched to branch: *repo/branch/ (glob)
   $ echo b > b
-  $ bzr add b
-  adding b
-  $ bzr ci -qm addb --commit-time '2012-01-01 00:00:02 +0000'
+  $ bzr add -q b
+  $ bzr ci -qm addb
   $ bzr tag branch-tag
   Created tag branch-tag.
   $ bzr switch --force ../repo/trunk
   Updated to revision 1.
   Switched to branch: */repo/trunk/ (glob)
   $ echo a >> a
-  $ bzr ci -qm changea --commit-time '2012-01-01 00:00:03 +0000'
+  $ bzr ci -qm changea
   $ cd ..
   $ hg convert --datesort repo repo-bzr
   initializing destination repo-bzr repository
@@ -269,8 +267,7 @@ Nested repositories (issue3254)
   $ bzr co repo/inner/trunk inner-trunk
   $ cd inner-trunk
   $ echo b > b
-  $ bzr add b
-  adding b
+  $ bzr add -q b
   $ bzr ci -qm addb
   $ cd ..
   $ hg convert --datesort repo noinner-bzr