1 files changed, 27 insertions, 0 deletions
diff --git a/tests/test-update-renames.t b/tests/test-update-renames.t
new file mode 100644
index 0000000..829317a
--- /dev/null
+++ b/tests/test-update-renames.t
@@ -0,0 +1,27 @@
+Test update logic when there are renames
+
+Update with local changes across a file rename
+
+  $ hg init
+
+  $ echo a > a
+  $ hg add a
+  $ hg ci -m a
+
+  $ hg mv a b
+  $ hg ci -m rename
+
+  $ echo b > b
+  $ hg ci -m change
+
+  $ hg up -q 0
+
+  $ echo c > a
+
+  $ hg up
+  merging a and b to b
+  warning: conflicts during merge.
+  merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges
+  [1]