[Monotone-commits-diffs] net.venge.monotone: 01ad8f819a7829e038e13cd72c9ee8de9ebea121

[code]

revision:            01ad8f819a7829e038e13cd72c9ee8de9ebea121
date:                2010-11-29T01:47:40
author:              Timothy Brownawell  <address@hidden>
branch:              net.venge.monotone
changelog:
Update tests to not expect a report that the workspace wasn't updated.

manifest:
format_version "1"

new_manifest [7692fe0a4c91b6265c6827837e329a4148af2c96]

old_revision [46d701cb0f163e312543d5aad26ea7a247b58208]

patch "tests/merge_--update/__driver__.lua"
 from [f67439ada14b3299819824e9a5d4c55bb7dd823d]
   to [8a14242bea6908123210ad013c4f021add4ebb38]

patch "tests/resolve_conflicts_all_resolutions/merge-1"
 from [966446270b4e33f40298398f39eba962236fa8df]
   to [4026a57330dfa66af8afa0eccd8aad978793991d]

patch "tests/resolve_conflicts_content/merge-1"
 from [ee763684ea041eb0f99b496fa3c75a94b32add4e]
   to [bb23ecbb7f05a2de91d69a101ef6df827173c202]

patch "tests/resolve_conflicts_duplicate_name/merge-1"
 from [69b6b13be1a3467990563ac4a6a8fdf539bf6df0]
   to [96a1dee6eedb48a6bc82c02c6b940824d81c7d44]

patch "tests/resolve_conflicts_none/merge-1"
 from [340300e991f4802e902e22ceb1ffa8db5158d798]
   to [ed921a4fb3f2bb63f5319bf6ed448a24687e3ca0]

patch "tests/resolve_conflicts_propagate/propagate-1"
 from [99661c3e202ac5aac6f6bb93eb708a73f4c44278]
   to [b99435dfefbfda234d6fa35b2762eaf767cd1081]

patch "tests/resolve_conflicts_propagate/propagate-2"
 from [a0b6a8000ff7604ea3d1d3ec795543fc823bb43e]
   to [834d66cde71ddbf1df55ac19f19ab2e19c8de118]
============================================================
--- tests/resolve_conflicts_content/merge-1	ee763684ea041eb0f99b496fa3c75a94b32add4e
+++ tests/resolve_conflicts_content/merge-1	bb23ecbb7f05a2de91d69a101ef6df827173c202
@@ -6,4 +6,3 @@ mtn: [merged] bd6a2c0363cab1cf19220bce15
 mtn: replacing content of files/inter1, files/inter1 with _MTN/resolutions/files/inter1
 mtn: replacing content of files/inter2, files/inter2 with _MTN/resolutions/inter_merged
 mtn: [merged] bd6a2c0363cab1cf19220bce150c77b84b1a5a32
-mtn: note: your workspace has not been updated
============================================================
--- tests/resolve_conflicts_all_resolutions/merge-1	966446270b4e33f40298398f39eba962236fa8df
+++ tests/resolve_conflicts_all_resolutions/merge-1	4026a57330dfa66af8afa0eccd8aad978793991d
@@ -14,4 +14,3 @@ mtn: [merged] 6363bd08ae08d7e57067ba6476
 mtn: merged simple_file, simple_file
 mtn: replacing content of user_file, user_file with resolutions/user_file
 mtn: [merged] 6363bd08ae08d7e57067ba6476f76417c72f1a25
-mtn: note: your workspace has not been updated
============================================================
--- tests/resolve_conflicts_duplicate_name/merge-1	69b6b13be1a3467990563ac4a6a8fdf539bf6df0
+++ tests/resolve_conflicts_duplicate_name/merge-1	96a1dee6eedb48a6bc82c02c6b940824d81c7d44
@@ -8,4 +8,3 @@ mtn: [merged] 14964233a7361ada1ba962f786
 mtn: renaming thermostat.c to thermostat-westinghouse.c
 mtn: renaming thermostat.c to thermostat-honeywell.c
 mtn: [merged] 14964233a7361ada1ba962f7863d4fee12f30df7
-mtn: note: your workspace has not been updated
============================================================
--- tests/resolve_conflicts_none/merge-1	340300e991f4802e902e22ceb1ffa8db5158d798
+++ tests/resolve_conflicts_none/merge-1	ed921a4fb3f2bb63f5319bf6ed448a24687e3ca0
@@ -4,4 +4,3 @@ mtn: [merged] 7f38dd536c4f995a4a7ccd788d
 mtn: [left]  bcd098b31f9ed42acfb5ab550c973e7d8f7203fd
 mtn: [right] c28c3c0f5a7f9cde848be91f79d86a6dd63e88ca
 mtn: [merged] 7f38dd536c4f995a4a7ccd788d2b5be2755805cf
-mtn: note: your workspace has not been updated
============================================================
--- tests/resolve_conflicts_propagate/propagate-1	99661c3e202ac5aac6f6bb93eb708a73f4c44278
+++ tests/resolve_conflicts_propagate/propagate-1	b99435dfefbfda234d6fa35b2762eaf767cd1081
@@ -6,4 +6,3 @@ mtn: [merged] a74c964afba9c299c81ec404e5
 mtn: renaming thermostat.c to thermostat-westinghouse.c
 mtn: renaming thermostat.c to thermostat-honeywell.c
 mtn: [merged] a74c964afba9c299c81ec404e5233ad6faffadc1
-mtn: note: your workspace has not been updated
============================================================
--- tests/resolve_conflicts_propagate/propagate-2	a0b6a8000ff7604ea3d1d3ec795543fc823bb43e
+++ tests/resolve_conflicts_propagate/propagate-2	834d66cde71ddbf1df55ac19f19ab2e19c8de118
@@ -2,4 +2,3 @@ mtn: no merge necessary; putting a74c964
 mtn: [left]  a74c964afba9c299c81ec404e5233ad6faffadc1
 mtn: [right] 1337cb1059c4bc3e376b14381b43e9383c654da1
 mtn: no merge necessary; putting a74c964afba9c299c81ec404e5233ad6faffadc1 in branch 'abe_branch'
-mtn: note: your workspace has not been updated
============================================================
--- tests/merge_--update/__driver__.lua	f67439ada14b3299819824e9a5d4c55bb7dd823d
+++ tests/merge_--update/__driver__.lua	8a14242bea6908123210ad013c4f021add4ebb38
@@ -14,7 +14,7 @@ check(mtn("merge"), 0, nil, true)
 right = base_revision()
 
 check(mtn("merge"), 0, nil, true)
-check(qgrep("not been updated", "stderr"))
+check(not qgrep("update", "stderr"))
 check(mtn("heads"), 0, true, false)
 check(not qgrep(base_revision(), "stdout"))