[PATCH] Make ui.warn write to stderr -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Make ui.warn write to stderr From: Bryan O'Sullivan <bos@serpentine.com> > Someone is probably using ui.write instead of ui.warn. Actually, ui.warn uses ui.write. So hg never prints to stderr right now. Here's a patch to fix that. [mpm: add sys.stdout.flush()] manifest hash: c09c645a5985b640a7ad884afb0eeb11fcffbb19 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxcEaywK+sNU5EO8RAhWUAJ9vVteAodKC9zIhIWUuPqVl2d915QCePp5S asuv62w4Zv+o0gB3SoucYdQ= =NYrs -----END PGP SIGNATURE-----

#!/bin/sh

export HGMERGE=true

set -ex
mkdir r1
cd r1
hg init
echo a > a
hg addremove
hg commit -t "1" -u test -d "0 0"

hg clone . ../r2
cd ../r2
hg up
echo abc > a
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

cd ../r1
echo b > b
echo a2 > a
hg addremove
hg commit -t "2" -u test -d "0 0"

cd ../r2
hg -q pull ../r1
hg status
hg -d up
hg -d up -m
hg parents
hg -v history
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d