We have struggled a bit with locks over a long period of time and I’d like to figure out if there’s a better workflow for us to avoid our lock related problems.
We’d like to have a build machine to build light maps in the evenings/weekends. We set this up to merge /main to a working branch and do the work there, check in and attempt to merge to /main. The problem here is that it’s unable to check in the work because someone else is working on the assets in /main. We don’t really care about this. We want it to commit regardless and we can do a manual resolve if the merge fails. First we got problems because the build machine locks files, then we excluded locks on its branch and got problems with retained locks where people on /main aren’t able to check out because files are modified in the light map branch. The general case is that we seem to end up wanting to override the lock for specific checkins and accept to deal with the merge issues. Is there a way to get UVCS to handle this?
We’re using a lot of task branches and end up in situations where we’re modifying locked resources locally in order to test things. Then we’re switching between working from the office and from home and want to keep our local changes. Ideally we would shelve them and unshelve in the other location but that won’t work because of locks. We’re not allowed to shelve/unshelve a resource someone has locked, even if we really just want to make the file writable. Is there a way to move a temporary change on a locked resource between computers?
/Jonas