Fossil knows nothing about syntax of any sort, so a merge must consider any change as significant. Try reindenting a python script, where whitespace is part of the syntax. Diff can be told to ignore changes in spacing, iirc. If you switch from unix EOL to Windows EOL fossil will see the whole file (well, the EOL bytes) as changed.
----- stephan Sent from a mobile device, possibly from bed. Please excuse brevity, typos, and top-posting. On Sep 15, 2015 2:24 PM, "Scott Doctor" <[email protected]> wrote: > > a sideways question on this topic. Assume in my C editor I run the code > formatter operation which indents and parses certain tokens for cosmetic, > but not functional, changes in the file. By parsing I mean operations such > as adding/removing linefeeds before/after a token such as a bracket or > semicolon, and removing/adding blanks lines and spaces. > > Will the merge and diff operations see the file as completely changed? > > > ------------ > Scott Doctor > [email protected] > ------------------ > > On 9/15/2015 5:13 AM, Richard Hipp wrote: > >> On 9/15/15, Eric Rubin-Smith <[email protected]> wrote: >> >>> The merge algorithm does *not* consider cherry-picks. It looks for >>>> the most recent common ancestor without taking cherry-picks into >>>> account. >>>> >>> Another popular version control tool whose name I won't mention (hint: >>> rhymes with "zit") behaves identically to fossil in this scenario. Is >>> there >>> some deeper reason for not using the cherry pick "arrow", or is it simply >>> that yall haven't had a need to improve the behavior here yet so haven't >>> bothered? >>> >>> Merge is done by a classic 3-way diff. It looks at all the changes >> that occurred on the path from A to B and applies those same changes >> to C. (A in this case would be the most recent common ancestor of B >> and C). >> >> How would cherry-picks factor into this? >> >> > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users >
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
