On Aug 12, 2015, at 5:57 PM, Andy Bradford <amb-fos...@bradfords.org> wrote: > > Thus said Warren Young on Wed, 12 Aug 2015 13:50:10 -0600: > >> Fossil will be more consistent in its behavior when mv-rm-files >> becomes the default behavior. > > I'm not sure > how changing this will make it any more consistent.
The OP laid out one case: f checkin --branch feature f rm --hard foo/bar.txt f ci -m ‘removed unwanted bar.txt file’ f up trunk f merge feature With the “classic” behavior, bar.txt comes back when you “up trunk,” which is expected, but remains left behind after the merge, which is not expected. With mv-rm-files enabled, merging the feature branch removes bar.txt from the local checkout. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
