Re: [fossil-users] Converting to/from symlinks
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 Youngwrote: > On Feb 27, 2018, at 2:42 PM, Svyatoslav Mishyn > 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 > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- http://fresh.flatassembler.net http://asm32.info John Found ___ 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] Converting to/from symlinks
On Feb 27, 2018, at 2:42 PM, Svyatoslav Mishynwrote: > > 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 fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
[fossil-users] Converting to/from symlinks
Hi, it seems that when `allow-symlinks` option is enabled, file which was already added cannot be overwritten by a symlink, see a test. mkdir test && cd test fossil init .fossil && fossil open .fossil fossil set allow-symlinks 0 cp ~/.ssh/default.pub . && fossil add default.pub && fossil ci -m file fossil set allow-symlinks 1 ln -fs ~/.ssh/default.pub default.pub fossil ci -m symlink New_Version: 163fd28f692b571070e1471fa3236ba46b0f121cbc11553c4203fc937831dca5 ERROR: [default.pub] is 27 bytes on disk but 726 in the repository NOTICE: Repository version of [default.pub] stored in [file-f8c1d36b817714f6] working checkout does not match what would have ended up in the repository: 6810fe7cfca414a1c2f36cea0619a695 versus 8fa57811ea8fcd434443c61628f62d73 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? (Tested with trunk version.) -- https://www.juef.space/ signature.asc Description: PGP signature ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users