Patchwork [3,of,4,V2] tests: test updating with dirty largefiles in a subrepo

login
register
mail settings
Submitter Matt Harbison
Date Jan. 6, 2013, 10:16 p.m.
Message ID <3e9e34fd72948c311e03.1357510600@Envy>
Download mbox | patch
Permalink /patch/406/
State Changes Requested
Headers show

Comments

Matt Harbison - Jan. 6, 2013, 10:16 p.m.
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1357450881 18000
# Node ID 3e9e34fd72948c311e032778c75a9fab2bb5d399
# Parent  06f51c9f9a9b5c47b9d763949f9559dafe5437a3
tests: test updating with dirty largefiles in a subrepo

Prior to 17c030014ddf, subrepos were unconditionally cleaned.  This ensures that
dirty largefiles survive a regular update, and get replaced on 'update -C'.

Patch

diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -1715,6 +1715,21 @@ 
   1 largefiles updated, 0 removed
   $ hg -R ../update_on_clone status -S
 
+Check that a clean subrepo update replaces largefiles
+
+  $ echo "modified" > ../update_on_clone/subrepo/large.txt
+  $ hg -R ../update_on_clone update
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ hg -R ../update_on_clone status -S
+  M subrepo/large.txt
+  $ hg -R ../update_on_clone update -C
+  getting changed largefiles
+  1 largefiles updated, 0 removed
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  getting changed largefiles
+  0 largefiles updated, 0 removed
+  $ hg -R ../update_on_clone status -S
+
 Test archiving a revision that references a subrepo that is not yet
 cloned (see test-subrepo-recursion.t):