Timeline for How do teams prevent overwriting work in source files?
Current License: CC BY-SA 3.0
12 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Jan 15, 2015 at 9:19 | comment | added | xorsyst | @ZanLynx it will if you correctly set the svn:needs-lock property on the file, which you should do for all non-text files, usually automatically using the config options. | |
| Jan 14, 2015 at 19:54 | comment | added | Zan Lynx | @xorsyst: Try it this way: check out from SVN in two locations. Then lock a file from location 1. Location 2 won't know it is locked until commit or update. | |
| Jan 14, 2015 at 17:44 | comment | added | xorsyst | Just to correct a technical point: SVN does prevent people making changes to their working copy, as it sets locked files as read-only in the file system. | |
| Jan 14, 2015 at 11:54 | comment | added | sehe | @MSalters PasticSCM comes with builtin image diffing tools: plasticscm.com/gallery.html#image-diffing | |
| Jan 14, 2015 at 11:26 | comment | added | MSalters |
@O.R.Mapper: Getting parent-child relations right is fairly easy. Both versions to renconcile may be assumed to be correct, after all. My main concern would be max-occurs; if two childs are added when one is allowed you have an invalid document.
|
|
| Jan 14, 2015 at 10:31 | comment | added | O. R. Mapper | @MSalters: And even that (the XML example) sounds easier than it might be. Preserving well-formedness could be feasible, but preserving validity for any particular XML format could be problematic (as, even while remaining well-formed, arbitrary elements cannot always be nested in arbitrary other elements). | |
| Jan 13, 2015 at 11:14 | comment | added | Maurycy | @MSalters Sure, with that I can agree much more. | |
| Jan 13, 2015 at 10:57 | comment | added | MSalters | @MaurycyZarzycki: Changing the same letter is similar to changing the same pixel: that needs manual resolving. .JPEG probably was a bad example, I now realize, because artists don't work on lossy formats. But the merge issue also exists with .PNG. At the very least, you'd appreciate if merge tools would be able to merge XML without breaking it. | |
| Jan 13, 2015 at 10:50 | comment | added | Maurycy | @MSalters It's not that the tools suck, it's just that most of the merge tools are created for text, not for binary data. And how would you resolve a conflict if two changes modified the same pixel in a file? Or even worse, how would you factor in the changes caused by JPEG compression? It's a very complex issue which might not even have a single good solution, so the reason most merge tools don't support is because the need for that is very rare and the functionality difficult to implement. | |
| Jan 12, 2015 at 16:56 | comment | added | MSalters | On the plus side, locking is about the only way you can edit a .JPEG or other non-plain-text file. This isn't a theoretical limitation, it's just that the merge tools usually suck. | |
| Jan 11, 2015 at 22:57 | history | edited | Mac | CC BY-SA 3.0 |
added 379 characters in body
|
| Jan 11, 2015 at 22:44 | history | answered | Mac | CC BY-SA 3.0 |