##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: fix test-fetch port number variability
Matt Mackall -
r12535:975ec4ce default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -82,7 +82,7 b' fetch over http, no auth'
82 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
82 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
83 merging with 1:5e056962225c
83 merging with 1:5e056962225c
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
85 new changeset 3:0b6439e938f9 merges remote changes with local
85 new changeset 3:* merges remote changes with local (glob)
86 $ hg --cwd d tip --template '{desc}\n'
86 $ hg --cwd d tip --template '{desc}\n'
87 Automated merge with http://localhost:*/ (glob)
87 Automated merge with http://localhost:*/ (glob)
88
88
@@ -99,7 +99,7 b' fetch over http with auth (should be hid'
99 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
99 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
100 merging with 1:5e056962225c
100 merging with 1:5e056962225c
101 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
101 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
102 new changeset 3:0b6439e938f9 merges remote changes with local
102 new changeset 3:* merges remote changes with local (glob)
103 $ hg --cwd e tip --template '{desc}\n'
103 $ hg --cwd e tip --template '{desc}\n'
104 Automated merge with http://localhost:*/ (glob)
104 Automated merge with http://localhost:*/ (glob)
105 $ hg clone a f
105 $ hg clone a f
General Comments 0
You need to be logged in to leave comments. Login now