Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-up-local-change @ 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 |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
1 #!/bin/sh |
331 | 2 |
3 export HGMERGE=true | |
4 | |
5 set -ex | |
6 mkdir r1 | |
7 cd r1 | |
8 hg init | |
9 echo a > a | |
10 hg addremove | |
11 hg commit -t "1" -u test -d "0 0" | |
12 | |
485 | 13 hg clone . ../r2 |
14 cd ../r2 | |
331 | 15 hg up |
16 echo abc > a | |
332 | 17 hg diff > ../d |
18 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d | |
331 | 19 |
20 cd ../r1 | |
21 echo b > b | |
22 echo a2 > a | |
23 hg addremove | |
24 hg commit -t "2" -u test -d "0 0" | |
25 | |
26 cd ../r2 | |
27 hg -q pull ../r1 | |
28 hg status | |
29 hg -d up | |
30 hg -d up -m | |
31 hg parents | |
32 hg -v history | |
332 | 33 hg diff > ../d |
34 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d | |
331 | 35 |