diff tests/ignore_and_prioritize.t @ 48:00995da9c204

Implemented priorities, fixed bugs in ignoring, both should work. Testfixes
author Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
date Sun, 25 Sep 2016 21:20:31 +0200
parents e695060c716e
children d76b40291d10
line wrap: on
line diff
--- a/tests/ignore_and_prioritize.t	Sun Sep 25 10:22:37 2016 +0200
+++ b/tests/ignore_and_prioritize.t	Sun Sep 25 21:20:31 2016 +0200
@@ -23,8 +23,8 @@
   > [extensions]
   > mercurial_all_paths =
   > [all_paths]
-  > ignore = unknown rep2
-  > prioritize = rep3 mystery rep1
+  > ignore = unknown remote2
+  > prioritize = remote3 mystery remote1
   > EOF
 
 We need some repositories to test.
@@ -58,9 +58,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-
-  Skipping ignored rep2
-
+  
   pushing to */rep1 (glob)
   searching for changes
   adding changesets
@@ -91,21 +89,20 @@
 
 
   $ hg --cwd $REP2 update
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ cat >> $REP2/file.txt << EOF
   > From repo2…
   > EOF
 
   $ hg --cwd $REP2 add
+  adding file.txt
   $ hg --cwd $REP2 commit -m "In repo2"
 
   $ hg --cwd $BASE incomingall
   comparing with */rep3 (glob)
   searching for changes
   no changes found
-
-  Skipping ignored rep2
   
   comparing with */rep1 (glob)
   searching for changes
@@ -119,8 +116,6 @@
   pulling from */rep3 (glob)
   searching for changes
   no changes found
-
-  Skipping ignored rep2
   
   pulling from */rep1 (glob)
   searching for changes
@@ -144,8 +139,6 @@
   date:        .* (re)
   summary:     In repo2
   
-  Skipping ignored rep2
-  
   comparing with */rep3 (glob)
   searching for changes
   changeset:   1:* (glob)