Hi, Von: Ben Reser [mailto:b...@reser.org] > On 2/24/14, 8:30 AM, Thomas Åkesson wrote: > > We would like to enhance the locking in Subversion to support use cases > where the user needs to ensure that added files will be possible to commit. > There are a couple of use cases: > > > > 1. Adding files that are dependencies to other files, where the reference > mechanism is cumbersome. Simple cases include XML files that reference > graphics or XIncludes (can be difficult to refactor after a conflict, > especially for non-technical users). More complex cases include file formats > that are not open and where references are difficult to manage, e.g. MS Word, > InDesign, certain modeling tools. > > > > 2. There is a standardized naming convention based on series. The next file > of a certain type should take the next available number. Then there is a race > condition btw different users; how quickly can they finish work and commit > after determining the next number and adding to WC. > > > > One mapping towards svn usage could be: > > svn up > > touch model0018.xml #or create the file with the software. > > svn add model0018.xml > > svn lock model0018.xml > > # invest effort in the new file and potentially link to it from other files. > > svn commit > > Why does doing the following where the empty file is always immediately > created not work for these use cases: > svn up > touch model0018.xml > svn add model0018.xml > svn ci -m'Create model0018.xml' > svn lock model0018.xml > > Worst case senario for this seems to be the following.
One obvious difference is that you actually have an empty file committed for some timeframe, which may lead to other problems (like CI-Systems failing, or maybe even pre-commit hooks which try to perform consistency checks...) Best regards Markus Schaber CODESYS® a trademark of 3S-Smart Software Solutions GmbH Inspiring Automation Solutions 3S-Smart Software Solutions GmbH Dipl.-Inf. Markus Schaber | Product Development Core Technology Memminger Str. 151 | 87439 Kempten | Germany Tel. +49-831-54031-979 | Fax +49-831-54031-50 E-Mail: m.scha...@codesys.com | Web: http://www.codesys.com | CODESYS store: http://store.codesys.com CODESYS forum: http://forum.codesys.com Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915