On Tue, Jul 30, 2013 at 10:45:31AM +0100, Jan Nijtmans wrote: > 2013/7/30 Lluís Batlle i Rossell <[email protected]>: > > About the code starting at line 1693, it looks to me like it runs in any > > case. > > Does this change only add a new "--integrate", or it also changes the > > behaviour > > of usual merges? > > That code does an additional pass over the vmerge table, in order to > determine which branches should be closed. Existing merges > never produce "id=-4" so the query will give the empty result then.
But maybe it should not run unless in 'integrate' mode? _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
