r847064 | sussman | 2003-09-05 23:47:10 +0000 (Fri, 05 Sep 2003) Make 'svn ls -v' display years when appropriate. Cool. :-) Patch by: Peter S. Housel <housel@acm.org> * cmdline/ls-cmd.c (print_dirents): Include the date (instead of the time) in the verbose list output if the entry's date is more than half a year in the past or future.
r852032 | kfogel | 2004-11-20 02:37:17 +0000 (Sat, 20 Nov 2004) Properly handle the merging of property changes into a deleted file. Patch by: Peter S. Housel <housel@acm.org> me From issue #2132. * subversion/libsvn_client/diff.c (merge_props_changed): Filter SVN_ERR_UNVERSIONED_RESOURCE errors as well as SVN_ERR_ENTRY_NOT_FOUND errors. * subversion/include/svn_wc.h (svn_wc_merge_prop_diffs): Document when SVN_ERR_UNVERSIONED_RESOURCE is returned, since we depend on it now. * subversion/tests/clients/cmdline/merge_tests.py: Import SVNAnyOutput. (merge_prop_change_to_deleted_target): New test. (test_list): Run it.