On Thu, Nov 30, 2017 at 10:06 PM, Andy Bradford <amb-sendok-1514667978.gogchbpihoafjfdje...@bradfords.org> wrote: > Thus said Paolo Bolzoni on Thu, 30 Nov 2017 12:40:17 +0100: > >> It worked fairly well until I received an unexpected update of the >> original files. I unpacked the new files in dir1 and fossil detected >> hundreds of changes; looking better however this changes are mostly >> just order changes. > > Can you give a more concrete example? I'm not sure what you mean by they > are ``mostly just order changes.'' What order changed? > >> So, my problem is... what is the best way to proceed? I can start a >> new fossil repository, but I would lose the history in dir2. I can >> delete dir1 and recommit the two versions sorted, but it would add >> lots of needless changes in the repo again. > > What exactly are you doing here? How can you lose history of dir2 if the > history is committed to Fossil? > > Again, I think additional details would be helpful. Some fossil and > shell commands that show how to reproduce your situation would be > useful. > > Thanks, > > Andy > -- > TAI64 timestamp: 400000005a2072ee
The dir1 files are key-value stores, a file contents look like this: keyn,this is;an array;of values, key1,value, key3,2.1, key2,another value, The order of the keys is not important. What happened is that I got an update of these files and the new version changed the order of most the keys, but it changed only few values. However, this changes in the order made the fossil diffs confusing and large. If I could go back, I would store all the files sorted, and here comes the question. Can I make fossil forget all the changes in dir1? so I put back them back properly sorted? The obvious solution would be to delete the fossil repository and do it again, but I would not like to do so as as I would lose my changes in the second dir. I am not sure what command lines would help, but I sorted the files with: $ find /directory -type f -exec lsort.sh ';' where lsort.sh contains: LC_ALL=C sort <"$1" >/tmp/"$$"_tmp mv /tmp/"$$"_tmp "$1" _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
