2013/7/12 Stephan Beal <sgb...@googlemail.com>: > On Fri, Jul 12, 2013 at 10:25 AM, Jan Nijtmans wrote: >> Well, just try out the "merge-integrate" branch. I would say >> the glass is full again. ;-) > > Indeed it is! i like what you've done :)
I made one additional change: adding states UPDATED_BY_INTEGR and ADDED_BY_INTEGR (comparable to their XXX_BY_MERGE equivalent) in "fossil (status|changes|ls -v)" See: <http://www.fossil-scm.org/index.html/info/2015bbd55d> Still no objections, anyone? I think it's ready to be integrated into trunk (using "merge --integrate", of course), but another round of evaluation never hurts! Thanks, Jan Nijtmans _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
