Thus said Paolo Bolzoni on Mon, 04 Dec 2017 12:43:19 +0100: > The customer did an update and sent me the new version. This was > unexpected, as I from the discussion we had I understood that I was > pretty much the only one working on that. Fortunately, there were no > conflicts; but once copied the new version the mess started as their > dump changed the order of many files even if the content were > semantically the same.
At this point, after having realized that they have now sorted the contents of the files, and, before you committed the newly submitted changes, you could have done, ``fossil revert'' to get your working checkout back to what you're used to. Then, if you know that all the files are going to be sorted, you could run a controlled transform of your files and commit that. Then extract the customer provided new version and if you have matched the sorting algorithm that they are using in their files, then you should have a much smaller commit to deal with from them. It sounds like you already have things under control. Andy -- TAI64 timestamp: 400000005a262b24 _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
