Thomas Arendsen Hein <thomas@intevation.de> [Sat, 14 Oct 2006 10:39:40 +0200] rev 3388
merge with upstream
Matt Mackall <mpm@selenic.com> [Fri, 13 Oct 2006 17:58:04 -0500] rev 3387
merge: update dirstate correctly for non-branchmerge updates
- we don't actually need the context in recordupdates
- use -1 for filesize to force check on normal update
- only record copy for branchmerges
- forget moved files on update
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 13 Oct 2006 15:34:35 -0300] rev 3386
use short hashes with diff -v
Brendan Cully <brendan@kublai.com> [Fri, 13 Oct 2006 11:17:17 -0700] rev 3385
Use manifest rev instead of changelog rev for linear manifest test
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 13 Oct 2006 19:35:08 +0200] rev 3384
Removed unused imports of mdiff and templater from ui.py
Brendan Cully <brendan@kublai.com> [Fri, 13 Oct 2006 09:58:55 -0700] rev 3383
log --copies: use manifest.find instead of delta when manifest parent is not rev-1
This fixes issue391.
Brendan Cully <brendan@kublai.com> [Fri, 13 Oct 2006 09:58:55 -0700] rev 3382
Test case for log --copies on non-linear manifests (issue391)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 13 Oct 2006 16:34:58 +0200] rev 3381
hgweb: fix path cleaning
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 13 Oct 2006 10:50:35 +0200] rev 3380
Merge with asak
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 12 Oct 2006 20:45:25 -0300] rev 3379
portability fix for test-ssh
The __del__ method of sshrepo reads the stderr of the remote process
until EOF and prints it.
If an exception is raised, this method ends up being called:
- on Linux: after the "abort: ..." message is printed
- on OS X: before the "abort: ..." message is printed
This patch explicitly flushes the stderr of the remote process before
raising a RepoError.