Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 565:9a80418646dd
[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-----
author | mpm@selenic.com |
---|---|
date | Fri, 01 Jul 2005 14:18:02 -0800 |
parents | 4fc63e22b1fe |
children | eb46971fc57f |
line wrap: on
line source
#!/bin/sh set -x hg init echo "nothing" > a hg add a hg commit -t ancestor -u test -d "0 0" echo "something" > a hg commit -t branch1 -u test -d "0 0" hg co 0 echo "something else" > a hg commit -t branch2 -u test -d "0 0" export HGMERGE=merge hg -d up -m 1 hg id grep -Ev ">>>|<<<" a hg status