On Mon, Dec 4, 2017 at 6:29 AM, Andy Bradford <amb-fos...@bradfords.org> wrote: > Thus said Paolo Bolzoni on Fri, 01 Dec 2017 09:18:10 +0100: > What do you mean by, ``I got an update of these files?'' > > Does that mean that someone else committed some changes to your > repository and when you did ``fossil update'' you got all their changes? > And you want to change them? > > Or does that mean you made some changes to the working checkout, and > committed them? > > Or does it mean that you made some changes to your working checkout and > decided you don't like the changes?
Now I see why it was confusing. Let me explain, the dir1 content comes from outside. It is basically a dump of the customer key store. 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. On Mon, Dec 4, 2017 at 10:10 AM, Mark Janssen <mpc.jans...@gmail.com> wrote: > Fossil cannot remove existing history. So removing only one dir and > the associated history is not possible. > > Why don't you just update the files to be sorted and after that always > keep adding them sorted? > > The diffs up until now will still be noisy, but from now on they will > be more readable and you will keep the previous history. Yes, that's what I am doing. I had a couple of large commits, but at all things considered it is not a big deal. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
