--- a/tests/groups-legacy.t	Sat Sep 24 22:46:21 2016 +0200
+++ b/tests/groups-legacy.t	Sat Sep 24 23:06:23 2016 +0200
@@ -86,7 +86,7 @@
   $ hg --cwd $BASE commit -m 'Second'
 
 
-  $ hg --cwd $BASE pushall -g even
+  $ hg --cwd $BASE pushall --group even
   pushing to */rep2 (glob)
   searching for changes
   adding changesets
@@ -138,7 +138,7 @@
 
   $ hg --cwd $REP2 commit -m "In repo2"
 
-  $ hg --cwd $BASE incomingall -g odd
+  $ hg --cwd $BASE incomingall --group odd
   comparing with */rep1 (glob)
   searching for changes
   changeset:   1:* (glob)
@@ -146,21 +146,24 @@
   user:        Andy Default <default@nowhere.net>
   date:        .* (re)
   summary:     In repo1
+  
+  comparing with */rep3 (glob)
+  searching for changes
+  no changes found
 
+  $ hg --cwd $BASE incomingall --group even
   comparing with */rep2 (glob)
   searching for changes
-  changeset:   1:* (glob)
+  changeset:   2:.* (re)
   tag:         tip
   user:        Andy Default <default@nowhere.net>
   date:        .* (re)
   summary:     In repo2
-
-  comparing with */rep3 (glob)
+  
+  comparing with */rep4 (glob)
   searching for changes
   no changes found
 
-  $ hg --cwd $BASE incomingall -g even
-
   $ hg --cwd $BASE pullall -g odd
   pulling from */rep1 (glob)
   searching for changes
@@ -174,11 +177,11 @@
   no changes found
 
   $ hg --cwd $BASE log  -T '{rev}: {desc}\n'
-  2: In repo2
-  1: In repo1
+  2: In repo1
+  1: Second
   0: First
 
-  $ hg --cwd $BASE outgoingall
+  $ hg --cwd $BASE outgoingall --group even
   comparing with */rep1 (glob)
   searching for changes
   changeset:   2:.* (re)
@@ -188,14 +191,16 @@
   date:        .* (re)
   summary:     In repo2
 
-  comparing with */rep2 (glob)
+  comparing with */rep3 (glob)
   searching for changes
   changeset:   1:* (glob)
   user:        Andy Default <default@nowhere.net>
   date:        .* (re)
   summary:     In repo1
 
-  comparing with */rep3 (glob)
+  $ hg --cwd $BASE outgoingall --group odd
+
+  comparing with */rep2 (glob)
   searching for changes
   changeset:   1:* (glob)
   user:        Andy Default <default@nowhere.net>
@@ -209,23 +214,22 @@
   date:        .* (re)
   summary:     In repo2
 
-
 Wrong groups do not work
 
   $ hg --cwd $BASE pullall -g unknown
-  abort: No paths defined in section paths
+  abort: No paths defined in section unknown
   [255]
 
-  $ hg --cwd $BASE incomingall -g unknown
-  abort: No paths defined in section paths
+  $ hg --cwd $BASE incomingall --group unknown
+  abort: No paths defined in section unknown
   [255]
 
-  $ hg --cwd $BASE outgoingall -g unknown
-  abort: No paths defined in section paths
+  $ hg --cwd $BASE outgoingall --group unknown
+  abort: No paths defined in section unknown
   [255]
 
   $ hg --cwd $BASE pushall -g unknown
-  abort: No paths defined in section paths
+  abort: No paths defined in section unknown
   [255]
 
 Neither do default commands without normal paths