Mercurial > hg-stable
changeset 17034:75fd9d1cf638 stable
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
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 26 Jun 2012 12:17:40 +0200 |
| parents | f8af57c00a29 |
| children | ba0286e149aa |
| files | tests/test-convert-bzr.t |
| diffstat | 1 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-convert-bzr.t Mon Jun 18 11:16:24 2012 +0200 +++ b/tests/test-convert-bzr.t Tue Jun 26 12:17:40 2012 +0200 @@ -215,25 +215,23 @@ $ 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 @@ $ 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