Thus said paul on Fri, 08 May 2015 21:17:36 +0100: > OK, so if I do a merge with baseline, supply two UUID's so that I only > merge the changes for one UUID, are you saying that cherrypick is a > shortcut for that, because you only need to supply one UUID with > cherrypick?
I see, you're talking about the difference between --baseline and --cherrypick. --baseline overrides the choice of the common ancestor used during the merge (e.g. the starting point for how much to merge, which could be more than is desired unless you're using the very tip of a branch), whereas --cherrypick takes just that 1 change, not a series of changes. > I think that one difference is that the cherrypick won't be shown the > same as a merge in the timeline though? Not currently. It has been discussed in the past how to render a cherrypick in the timeline. So far, it hasn't been a priority to make it happen. I believe all the data required is there make it happen (e.g. the manifest has a Q card which links it to a partial predecessor), but I'm not sure if there is any linkage in the database or if it just needs a new query for the timeline to produce a line for it. Thanks, Andy -- TAI64 timestamp: 40000000554d3a17 _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
