hgserver: update test output to reflect Mercurial 3.8; r?smacleod
MozReview-Commit-ID: 4cqjUlIc2wT
--- a/hgserver/tests/test-bookmarks-replication.t
+++ b/hgserver/tests/test-bookmarks-replication.t
@@ -75,23 +75,23 @@
Bookmarks get replicated to mirrors
$ http --no-headers ${HGWEB_0_URL}mozilla-central/json-bookmarks
200
{
"node": "e7d8e0aefcf6bcc137a21978e9a431c5b0dafd86",
"bookmarks": [{
+ "bookmark": "bm2",
+ "node": "e7d8e0aefcf6bcc137a21978e9a431c5b0dafd86",
+ "date": [0.0, 0]
+ }, {
"bookmark": "bm1",
"node": "04da6c25817b564b37238ee5144e5adf2af0cb5b",
"date": [0.0, 0]
- }, {
- "bookmark": "bm2",
- "node": "e7d8e0aefcf6bcc137a21978e9a431c5b0dafd86",
- "date": [0.0, 0]
}]
}
Push a bookmark update
$ echo bm2_2 > foo
$ hg commit -m 'bm2 commit 2'
$ hg log -r tip
@@ -120,23 +120,23 @@ Push a bookmark update
$ hgmo exec hgweb0 /var/hg/venv_replication/bin/vcsreplicator-consumer --wait-for-no-lag /etc/mercurial/vcsreplicator.ini
$ http --no-headers ${HGWEB_0_URL}mozilla-central/json-bookmarks
200
{
"node": "b222465a31a101470b94a950392809801a91d3da",
"bookmarks": [{
+ "bookmark": "bm2",
+ "node": "b222465a31a101470b94a950392809801a91d3da",
+ "date": [0.0, 0]
+ }, {
"bookmark": "bm1",
"node": "04da6c25817b564b37238ee5144e5adf2af0cb5b",
"date": [0.0, 0]
- }, {
- "bookmark": "bm2",
- "node": "b222465a31a101470b94a950392809801a91d3da",
- "date": [0.0, 0]
}]
}
Push a non-forward bookmark update
$ hg up -r 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(leaving bookmark bm2)
@@ -152,21 +152,21 @@ Push a non-forward bookmark update
$ hgmo exec hgweb0 /var/hg/venv_replication/bin/vcsreplicator-consumer --wait-for-no-lag /etc/mercurial/vcsreplicator.ini
$ http --no-headers ${HGWEB_0_URL}mozilla-central/json-bookmarks
200
{
"node": "b222465a31a101470b94a950392809801a91d3da",
"bookmarks": [{
- "bookmark": "bm1",
+ "bookmark": "bm2",
"node": "04da6c25817b564b37238ee5144e5adf2af0cb5b",
"date": [0.0, 0]
}, {
- "bookmark": "bm2",
+ "bookmark": "bm1",
"node": "04da6c25817b564b37238ee5144e5adf2af0cb5b",
"date": [0.0, 0]
}]
}
Push a bookmark delete
$ hg bookmark -d bm1