# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1446495915 28800
# Node ID 00209e38e7d96248436ad9b807dead70422db12a
# Parent  a6eb4e4811345b2a86b9da6fc64fc4d77e82221d
test-merge-prompt.t: add tests for linear updates + change/delete conflicts

Turns out this bit of code was woefully untested.

diff -r a6eb4e481134 -r 00209e38e7d9 tests/test-merge-prompt.t
--- a/tests/test-merge-prompt.t	Sat Oct 24 16:25:16 2015 -0700
+++ b/tests/test-merge-prompt.t	Mon Nov 02 12:25:15 2015 -0800
@@ -148,3 +148,25 @@
   changed
   *** file2 does not exist
 
+Non-interactive linear update
+
+  $ hg co -C 0
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo changed >> file1
+  $ hg rm file2
+  $ hg update 1 -y
+  local changed file1 which remote deleted
+  use (c)hanged version or (d)elete? c
+  remote changed file2 which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ status
+  --- status ---
+  A file1
+  C file2
+  --- file1 ---
+  1
+  changed
+  --- file2 ---
+  2
+  changed