Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 22 Jun 2007 20:44:40 -0300] rev 4681
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.
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.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 18:05:14 -0500] rev 4676
Merge with Eric Hopper
Eric Hopper <hopper@omnifarious.org> [Thu, 21 Jun 2007 10:40:09 -0700] rev 4675
Change branches to sort 'active' branches first, and add an option to show only active branches.
Matt Mackall <mpm@selenic.com> [Thu, 21 Jun 2007 18:02:03 -0500] rev 4674
merge: warn user about divergent renames
Patrick Mezard <pmezard@gmail.com> [Thu, 21 Jun 2007 22:19:41 +0200] rev 4673
Merge with crew
Marcos Chaves <marcos.nospam@gmail.com> [Thu, 21 Jun 2007 21:58:18 +0200] rev 4672
Handle CTRL+C in serve under Windows.