Thus said =?UTF-8?B?Wm9sdMOhbiBLw7Njc2k=?= on Thu, 16 Apr 2015 00:16:11 +1000:
> Is there a way to do that? That is, merge only a bunch of files > between two branches but leave everything else untouched on both > branches (and of course still having two branches)? Note that there > already are all sorts of differences between the branches, not just > the files of the re-written module. I don't know of a way to merge just a subselection of files, however, you can merge just a subselection of the checkins made while developing the new module using the --cherrypick option to ``fossil merge.'' http://www.fossil-scm.org/index.html/help?cmd=merge Andy -- TAI64 timestamp: 40000000552e79ca _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
