I have the same problem and it is strange (IMHO a bug) that fossil can detect such changes, but cant resolve them at all. Recently in one of my project I have massive replacements of files with symlinks. Now I have many broken chekins in the repository.
I hope this bug will be fixed ASAP. Regards On Tue, 27 Feb 2018 14:46:38 -0700 Warren Young <[email protected]> wrote: > On Feb 27, 2018, at 2:42 PM, Svyatoslav Mishyn <[email protected]> > wrote: > > > > So, if I want at some point to replace file by a symlink, > > first need to remove that file, commit changes, > > and only then add a symlink, right? > > I did just that for a file here just days ago using the 2.5 release version. > I’ve had no trouble due to the file -> symlink change, even when doing a > “fossil update” on machines that haven’t had an update since before the > change, so they’re effectively getting both changes at once. > > If for some reason you had to have this change appear atomically on the > trunk, you could remove the file, check it in on a branch, add the symlink, > check that in on the branch, and then “fossil merge --integrate > symlink-fix-branch” to cause both changes to appear on trunk together. > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- http://fresh.flatassembler.net http://asm32.info John Found <[email protected]> _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
