Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Mar 2008 16:17:19 -0300] rev 6380
qclone: do not abort if remote hasn't enabled mq (issue1040)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Mar 2008 13:45:01 -0300] rev 6379
hgweb: add compatibility code for old templates
Up to changeset 3340aa5a64f7, HTTP headers were expected to be embedded
in the "headers" template. Since that changeset, the content-type is
supposed to be defined as the "mimetype" template in the map file.
This changeset makes sure the old templates still work.
Matt Mackall <mpm@selenic.com> [Mon, 24 Mar 2008 11:12:57 -0500] rev 6378
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Mar 2008 17:02:31 +0100] rev 6377
test-convert-mtn: test directory move
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Mar 2008 17:02:08 +0100] rev 6376
convert: record deleted files in monotone source
Matt Mackall <mpm@selenic.com> [Mon, 24 Mar 2008 10:01:05 -0500] rev 6375
update: better logic and messages for updates
- complain about attempts to merge with ancestor
- when updating, differentiate between
- crossing named branches with no local changes (jump)
- crossing named branches with local changes (complain)
- nonlinear update on the same named branch, no changes (complain some more)
- nonlinear update on the same named branch, changes (different complaining)