From 66f303811fa12e60e8472bc4567b2ae67cf041e5 Mon Sep 17 00:00:00 2001 From: Matt Mackall Date: Mon, 27 Sep 2010 10:39:22 -0500 Subject: [PATCH] tests: fix test-fetch port number variability --- tests/test-fetch.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-fetch.t b/tests/test-fetch.t index 49f839da5f..de7c6514e6 100644 --- a/tests/test-fetch.t +++ b/tests/test-fetch.t @@ -82,7 +82,7 @@ fetch over http, no auth 1 files updated, 0 files merged, 1 files removed, 0 files unresolved merging with 1:5e056962225c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - new changeset 3:0b6439e938f9 merges remote changes with local + new changeset 3:* merges remote changes with local (glob) $ hg --cwd d tip --template '{desc}\n' Automated merge with http://localhost:*/ (glob) @@ -99,7 +99,7 @@ fetch over http with auth (should be hidden in desc) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved merging with 1:5e056962225c 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - new changeset 3:0b6439e938f9 merges remote changes with local + new changeset 3:* merges remote changes with local (glob) $ hg --cwd e tip --template '{desc}\n' Automated merge with http://localhost:*/ (glob) $ hg clone a f