[fossil-users] Overwriting binary files on 'update'
Hello, in fossil 1.21, I've a modified openoffice file. Then I run fossil update, and it tells me there is a merge conflict with a binary file, that it cannot merge. What I'm surprised about is that fossil overwrites my local changes with the incoming ones. And the file with local changes disappears, only available again on 'fossil undo'. Should't fossil better leave additional files in the directory, as with the -baseline, -original, and -merge? Regards, Lluís. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Overwriting binary files on 'update'
2012/3/1 Lluís Batlle i Rossell vi...@viric.name: Hello, in fossil 1.21, I've a modified openoffice file. Then I run fossil update, and it tells me there is a merge conflict with a binary file, that it cannot merge. What I'm surprised about is that fossil overwrites my local changes with the incoming ones. And the file with local changes disappears, only available again on 'fossil undo'. Should't fossil better leave additional files in the directory, as with the -baseline, -original, and -merge? Please, correct me if I am wrong, but I noticed that fossil update also overrides unmanaged files (both binary and text). I am not sure that their contents are backed up. --Leo-- ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] Overwriting binary files on 'update'
On Thu, Mar 1, 2012 at 8:03 AM, Leo Razoumov slonik...@gmail.com wrote: 2012/3/1 Lluís Batlle i Rossell vi...@viric.name: Hello, in fossil 1.21, I've a modified openoffice file. Then I run fossil update, and it tells me there is a merge conflict with a binary file, that it cannot merge. What I'm surprised about is that fossil overwrites my local changes with the incoming ones. And the file with local changes disappears, only available again on 'fossil undo'. Should't fossil better leave additional files in the directory, as with the -baseline, -original, and -merge? Please, correct me if I am wrong, but I noticed that fossil update also overrides unmanaged files (both binary and text). I am not sure that their contents are backed up. fossil update will also bring back files that have been fossil rm'd and physically removed. It'd be nice to be given the opportunity to abort as this can be a real pain. --Leo-- ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
