[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

diff3 followups

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-03-13 18:38:08 CET

Now that we're using diff3 for merging during updates, there are other
things that can be done:

 * have autoconf stop searching for 'patch'; we only need diff and
   diff3 now.

 * if a conflict occurs, users now have to hand-remove *three* backup
   files (instead of a single .rej file). if people think this is too
   burdensome, maybe we can just do timestamp comparisons instead --
   i.e., if the user has touched the file since the conflict, assume
   the conflict is gone. Is this preferable?

Other long-range changes can be made too, lower priority:

 * get rid of the entry->conflicted field, which is pointless (we can
   just depend completely on presence or absence of the conflict files
   in entry attributes and on disk).

 * rewrite the entire svn_wc_entry_t management system to use a
   consistent accessor interface -- get/set style or something -- and
   then simplify svn_wc__entry_modify() so it's just a straight write
   of the entry, instead of a nightmarish monstrosity requiring a
   Ph.D. in alchemy, an international driver's license, and a complete
   set of hex wrenches to use properly. (Thanks for the commentary,
   Karl.) :-)

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 13 20:54:21 2002

This is an archived mail posted to the Subversion Dev mailing list.