# HG changeset patch
# User Bryan O'Sullivan <bos@serpentine.com>
# Date 1201305382 28800
# Node ID 5963c0ad2853732b27b3fd07f88264309b2bd348
# Parent  ffaf2419de448b9332420c40a85d2381e70af3fb# Parent  b75105de8573831f4bfef10556e90e7f883ae8d5
Merge with crew

diff -r b75105de8573 -r 5963c0ad2853 mercurial/ui.py
--- a/mercurial/ui.py	Sat Jan 26 00:14:20 2008 +0100
+++ b/mercurial/ui.py	Fri Jan 25 15:56:22 2008 -0800
@@ -204,7 +204,8 @@
                     pathsitems = items
                 for n, path in pathsitems:
                     if path and "://" not in path and not os.path.isabs(path):
-                        cdata.set("paths", n, os.path.join(root, path))
+                        cdata.set("paths", n,
+                                  os.path.normpath(os.path.join(root, path)))
 
         # update verbosity/interactive/report_untrusted settings
         if section is None or section == 'ui':
diff -r b75105de8573 -r 5963c0ad2853 tests/test-keyword.out
--- a/tests/test-keyword.out	Sat Jan 26 00:14:20 2008 +0100
+++ b/tests/test-keyword.out	Fri Jan 25 15:56:22 2008 -0800
@@ -293,7 +293,7 @@
 added 1 changesets with 3 changes to 3 files
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % incoming
-comparing with test-keyword/Test-a/../Test
+comparing with test-keyword/Test
 searching for changes
 changeset:   1:0729690beff6
 tag:         tip
diff -r b75105de8573 -r 5963c0ad2853 tests/test-paths
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-paths	Fri Jan 25 15:56:22 2008 -0800
@@ -0,0 +1,11 @@
+#!/bin/sh
+base=`pwd`
+hg init a
+hg clone a b
+cd a
+echo '[paths]' >> .hg/hgrc
+echo 'dupe = ../b' >> .hg/hgrc
+hg in dupe | sed "s!$base!<base>!g"
+cd ..
+hg -R a in dupe | sed "s!$base!<base>!g"
+true
diff -r b75105de8573 -r 5963c0ad2853 tests/test-paths.out
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-paths.out	Fri Jan 25 15:56:22 2008 -0800
@@ -0,0 +1,5 @@
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+comparing with <base>/b
+no changes found
+comparing with <base>/b
+no changes found