merge with main


merge with main

Event Timeline

Thomas Arendsen Hein <thomas@intevation.de> committed rHGc9f615ab3082: merge with main.Feb 6 2008, 3:11 AM

Merged Changes

df659eb23360Aleix Conchillo Flaque
convert: added GNU Arch source converter 
Feb 5 2008
83633602e2c5Alexis S. L. Carvalho
qinit -c: add ^\.hg and ^\.mq to .hgignore 
Feb 8 2008
a1ebd5cd7e55Alexis S. L. Carvalho
dirstate.status: avoid putting ignored files in the unknown list 
Feb 8 2008
b41f0d6a74fcAlexis S. L. Carvalho
dirstate: don't walk ignored directories 
Feb 8 2008
7383384793fbAlexis S. L. Carvalho
revert: don't assume ignored files will be returned in the unknown list 
Feb 8 2008
d0dbae32517cAlexis S. L. Carvalho
revert: revert clean files when only a change of flags is needed 
Feb 8 2008
5b6190dfb344Alexis S. L. Carvalho
Revert e82dd2dd6276 
Feb 8 2008
6605a03cbf87Dirkjan Ochtman
make static-http work with empty repos (issue965) 
Feb 8 2008
cee68264ed92Patrick Mezard
mq: qimport must read patches in binary mode 
Feb 6 2008