[Monotone-commits-diffs] net.venge.monotone.issue-209: 215eae872b62927248079d06e3dc23e2c2d31787

[code]

revision:            215eae872b62927248079d06e3dc23e2c2d31787
date:                2012-07-23T08:54:11
author:              address@hidden
branch:              net.venge.monotone.issue-209
changelog:
resolve_conflicts_dropped_modified: a couple tests needed tweeking

* 
test/func/resolve_conflicts_dropped_modified_upstream_vs_local_2/__driver__.lua:

* test/func/resolve_conflicts_errors/__driver__.lua:

manifest:
format_version "1"

new_manifest [efee86b9590ca10a4a356c80f6cf1c396dd0ef99]

old_revision [435e3033125bd3f8ec04ac12da2f966354ae7434]

patch 
"test/func/resolve_conflicts_dropped_modified_upstream_vs_local_2/__driver__.lua"
 from [44b9528be152a46e15ddfcd5947dce86f13b76a8]
   to [80f056dd3773dab5d5019d78cbb0f7393d66bde3]

patch "test/func/resolve_conflicts_errors/__driver__.lua"
 from [11875ef629e7e6fbce9a06896813ad257291b8b8]
   to [0819ba223855d9814a7420c7412166b1109ed20f]
============================================================
--- test/func/resolve_conflicts_dropped_modified_upstream_vs_local_2/__driver__.lua	44b9528be152a46e15ddfcd5947dce86f13b76a8
+++ test/func/resolve_conflicts_dropped_modified_upstream_vs_local_2/__driver__.lua	80f056dd3773dab5d5019d78cbb0f7393d66bde3
@@ -130,9 +130,7 @@ check(samelines("stderr",
   "mtn: possible resolutions:",
   "mtn: resolve_first_right drop",
   "mtn: resolve_first_right rename",
-  "mtn: resolve_first_right user_rename \"new_content_name\" \"new_file_name\"",
-  "mtn: resolve_first_right keep",
-  "mtn: resolve_first_right user \"name\""}))   
+  "mtn: resolve_first_right user_rename \"new_content_name\" \"new_file_name\""}))   
 
 check(mtn("conflicts", "resolve_first_right", "drop"), 0, nil, true)
 check(samefilestd("conflicts_3_2_resolved", "_MTN/conflicts"))
@@ -159,9 +157,7 @@ check(samelines("stderr",
   "mtn: possible resolutions:",
   "mtn: resolve_first_left drop",
   "mtn: resolve_first_left rename",
-  "mtn: resolve_first_left user_rename \"new_content_name\" \"new_file_name\"",
-  "mtn: resolve_first_left keep",
-  "mtn: resolve_first_left user \"name\""}))   
+  "mtn: resolve_first_left user_rename \"new_content_name\" \"new_file_name\""}))   
 
 check(mtn("conflicts", "resolve_first_left", "drop"), 0, nil, true)
 check(samefilestd("conflicts_2_3_resolved", "_MTN/conflicts"))
============================================================
--- test/func/resolve_conflicts_errors/__driver__.lua	11875ef629e7e6fbce9a06896813ad257291b8b8
+++ test/func/resolve_conflicts_errors/__driver__.lua	0819ba223855d9814a7420c7412166b1109ed20f
@@ -108,7 +108,7 @@ check(samelines("stdout",
 check(grep("-v", "detected at", "stderr"), 0, true)
 canonicalize("stdout")
 check(samelines("stdout",
-{"mtn: misuse: other resolution must be 'drop', 'rename', or 'user_rename'"}))
+{"mtn: misuse: other resolution is content_user; specify 'drop', 'rename', or 'user_rename'"}))
 
 -- not in workspace; report nice error; conflicts file must be under
 -- _MTN, so need workspace. Fixes bug 30473