Commits

Markus Zapke-Gründemann  committed d4bf3f9

Updated test suite for Mercurial 2.2.x.

  • Participants
  • Parent commits 7396406

Comments (0)

Files changed (4)

File test-importfs-bigfile.t

   $ dd if=/dev/zero of=d1/f4 bs=1024 count=12000
   12000+0 records in
   12000+0 records out
-  12288000 bytes (12 MB) copied, * seconds, * MB/s (glob)
+  12288000 bytes transferred in * secs (* bytes/sec) (glob)
 
 Perform the import (the big file will create a warning):
 

File test-importfs-permissions.t

 
 Remove execute permissions from directory d3:
 
-  $ chmod u-X d1/d3
+  $ chmod u-x d1/d3
 
 Perform the import, fails because execute permissions are denied:
 
   $ chmod u+r d1/d3
   $ mkdir d1/d3/d4
   $ echo c4 > d1/d3/d4/f4
-  $ chmod u-X d1/d3/d4
+  $ chmod u-x d1/d3/d4
 
   $ hg importfs r2 d1
   created repository $TESTTMP/r2

File test-importfs-symlinks.t

 
   $ ls -la r2/d4/
   ls: r2/d4/: No such file or directory
-  [2]
+  [1]
 
 Clean up:
 
   [1]
   $ ls d1/d2/d4/
   ls: d1/d2/d4/: No such file or directory
-  [2]
+  [1]
   $ ln -s "d2\f3" d1/f6
   $ cat d1/f6
   cat: d1/f6: No such file or directory
   $ hg importfs --debug r3 d1
   created repository $TESTTMP/r3
   resolving manifests
-   overwrite True partial False
-   ancestor 000000000000+ local 000000000000+ remote 000000000000
+   overwrite: True, partial: False
+   ancestor: 000000000000+, local: 000000000000+, remote: 000000000000
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  creating directory $TESTTMP/r3/d3
-  creating symlink $TESTTMP/r3/d3/f5 -> ../f1
-  copying d1/f2 to $TESTTMP/r3/f2
-  copying d1/f1 to $TESTTMP/r3/f1
   creating directory $TESTTMP/r3/d2
-  dereferenced d1/d2/f4 to d1/d2/../f1
-  copying d1/d2/../f1 to $TESTTMP/r3/d2/f4
-  copying d1/d2/f3 to $TESTTMP/r3/d2/f3
   dereferenced d1/d2/d4 to d1/d2/../d3
   creating directory $TESTTMP/r3/d2/d4
   copying d1/d2/../d3/f5 to $TESTTMP/r3/d2/d4/f5
+  copying d1/d2/f3 to $TESTTMP/r3/d2/f3
+  dereferenced d1/d2/f4 to d1/d2/../f1
+  copying d1/d2/../f1 to $TESTTMP/r3/d2/f4
+  creating directory $TESTTMP/r3/d3
+  creating symlink $TESTTMP/r3/d3/f5 -> ../f1
+  copying d1/f1 to $TESTTMP/r3/f1
+  copying d1/f2 to $TESTTMP/r3/f2
   dereferenced d1/f6 to d1/d2/f3
   copying d1/d2/f3 to $TESTTMP/r3/f6
   adding d2/d4/f5

File test-importfs.t

   $ hg importfs -b b1 -r 0 -t t2 r d1
   5 files updated, 0 files merged, 1 files removed, 0 files unresolved
   marked working directory as branch b1
+  (branches are permanent and global, did you want a bookmark?)
   adding d2/f6
   adding d2/f7
   removing d3/f5
   $ hg importfs -b b2 -m "Creating branch b2" r d1
   7 files updated, 0 files merged, 0 files removed, 0 files unresolved
   marked working directory as branch b2
+  (branches are permanent and global, did you want a bookmark?)
   adding d3/f12
 
 Show the log of the last changeset: