Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 20:21:10 +0200] rev 4686
Remember path to 'hg' executable and pass to external tools and hooks as $HG.
Matt Mackall <mpm@selenic.com> [Sat, 23 Jun 2007 14:02:41 -0500] rev 4685
archive: remove spurious flag_bits setting
This makes zip -T on resulting archives work. File permissions are
still retained.
Matt Mackall <mpm@selenic.com> [Sat, 23 Jun 2007 13:33:45 -0500] rev 4684
convert: sometimes git forgets the author
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 23 Jun 2007 12:05:00 +0200] rev 4683
Merge with main
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 20:44:40 -0300] rev 4682
merge: fix small bug with a failed merge across a rename
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
Matt Mackall <mpm@selenic.com> [Fri, 22 Jun 2007 17:29:49 -0500] rev 4681
rollback: update help for issue316
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 19:43:29 -0300] rev 4680
transplant: fix locking order
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 19:06:04 -0300] rev 4679
git patches: correct handling of filenames with spaces
Add a trailing TAB to the "--- filename" lines if there's a space
in the file name. This allows patch(1) to work correctly. The
same is done for diff --nodates.
This was originally suggested by Andrei Vermel, but at the time
I thought git was doing something different.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 14:32:54 -0300] rev 4678
Work around urllib2 digest auth bug with Python < 2.5
This should fix issue570.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 21 Jun 2007 23:42:06 -0300] rev 4677
dirstate.status: if a file is marked as copied, consider it modified
After a "hg copy --force --after somefile cleanfile", cleanfile
shouldn't be considered clean anymore.