Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5712
bisect: fold in two trivial functions
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5711
bisect: remove two unused functions
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