Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:36 -0600] rev 5710
update test-merge-types
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:49:01 -0600] rev 5709
ui: allow default when prompting
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:47:44 -0600] rev 5708
merge: add flag merging intelligence
- properly handle all 27 combinations of flags
- prompt on conflicts
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:47:41 -0600] rev 5707
util: remove set_exec and set_link methods
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:29:21 -0600] rev 5706
patch: use util.set_flags
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:29:17 -0600] rev 5705
convert/svn: use util.set_flags
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:27:48 -0600] rev 5704
merge: use util.set_flags
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:27:47 -0600] rev 5703
wwrite: simplify with util.set_flags
- always attempt to delete the file (gets rid of read-only message)
- always write as a normal file
- use set_flags to convert to link or set exec
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:27:45 -0600] rev 5702
util: add new set_flags method
This is more efficient than calling set_link and set_exec
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:27:43 -0600] rev 5701
add --debug to test-merge-types
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:27:37 -0600] rev 5700
merge: simplify merge tests, fix exec flag bug
If local changed exec bit and remote changed file contents, exec bit
change would be lost.
Patrick Mezard <pmezard@gmail.com> [Thu, 27 Dec 2007 22:28:41 +0100] rev 5699
hg: fail upon copy/link errors while cloning locally
Maxim Dounin <mdounin@mdounin.ru> [Thu, 27 Dec 2007 03:14:46 +0300] rev 5698
convert: svn-sink: copy and set properties after adding dirs/files
We can't store properties for files we haven't added to repo. Similarly,
we can't copy file to directory we haven't added to svn yet. Remember
needed changes and apply them in putcommit().
Maxim Dounin <mdounin@mdounin.ru> [Thu, 27 Dec 2007 19:59:44 +0300] rev 5697
convert: don't read ~/.cvsrc in test-convert-cvs
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 27 Dec 2007 13:39:59 +0100] rev 5696
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 26 Dec 2007 23:03:32 +0100] rev 5695
merge with crew-stable
Maxim Dounin <mdounin@mdounin.ru> [Tue, 25 Dec 2007 21:14:11 -0800] rev 5694
convert: allow repo root to be matched in filemap
For consistency with "rename subdir ." syntax in filemap, also support
"rename . subdir".
Kirill Smelkov <kirr@mns.spb.ru> [Tue, 25 Dec 2007 18:48:43 +0300] rev 5693
.hgignore += tags & cscope files
Patrick Mezard <pmezard@gmail.com> [Tue, 25 Dec 2007 22:23:58 +0100] rev 5692
Merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 25 Dec 2007 14:30:10 +0100] rev 5691
merge with crew-stable
Mirko Friedenhagen <mirko-lists@friedenhagen.de> [Mon, 24 Dec 2007 17:21:40 +0100] rev 5690
server: append to logfiles
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Dec 2007 12:22:33 +0100] rev 5689
Move diffing missing file test and remove test-notfound
No point to have a test dedicated to this diff behaviour.
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Dec 2007 12:14:43 +0100] rev 5688
commands: add exits(1) if a specified file cannot be added (issue 891)
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Dec 2007 01:50:07 +0100] rev 5687
test-hgweb-commands: replace all "XX years ago" occurences
Lee Cantey <lcantey@gmail.com> [Fri, 21 Dec 2007 14:26:20 -0800] rev 5686
Switch to using cat with EOF doc instead of trying to quote newlines for echo.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 21 Dec 2007 21:50:19 +0100] rev 5685
Use skipped: instead of hghave: for skipping tests, use this in test-merge-types
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 21 Dec 2007 12:14:35 +0100] rev 5684
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 21 Dec 2007 10:24:03 +0100] rev 5683
Use common readlink.py instead of own implementations per test script.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 21 Dec 2007 09:51:19 +0100] rev 5682
Use test -h instead of test -L for portability
Citing from the GNU autoconf manual:
"either form conforms to Posix 1003.1-2001, but older shells like Solaris 8
/bin/sh support only -h"
Patrick Mezard <pmezard@gmail.com> [Fri, 21 Dec 2007 00:14:45 +0100] rev 5681
test-hgweb: fix css update