On Fri, Nov 13, 2015 at 4:33 PM, Tony Papadimitriou <to...@acm.org> wrote:
> The important thing is that the *common ancestor* with regards to this > line of code is the local version, since it hasn’t changed in the trunk, > only in the branch. So, I expected all (accumulated) changes in the > merged-in cherry-picked check-in from the branch to appear in the trunk > version. Am I right? > i can't say - we'll have to wait for one of the merge gurus to chime in. :/ -- ----- stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal "Freedom is sloppy. But since tyranny's the only guaranteed byproduct of those who insist on a perfect world, freedom will have to do." -- Bigby Wolf
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
