Re: In search of a version control system
On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: David Aguilar dav...@gmail.com writes: I would advise against the file locking, though. You ain't gonna need it ;-) What do you suggest to merge Word files? If the files are in the DOCX format you can just expand them as zip archives and diff what's inside of them. The text in particular is stored as XML. -- -Drew Northup -- As opposed to vegetable or mineral error? -John Pescatore, SANS NewsBites Vol. 12 Num. 59 -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: In search of a version control system
On Sun, Oct 21, 2012 at 7:20 PM, Drew Northup n1xim.em...@gmail.com wrote: On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: David Aguilar dav...@gmail.com writes: I would advise against the file locking, though. You ain't gonna need it ;-) What do you suggest to merge Word files? If the files are in the DOCX format you can just expand them as zip archives and diff what's inside of them. The text in particular is stored as XML. An XML diff means nothing to a regular user, and manually merging this way can produce unreadable Words files. So no, it's still not an answer. -- Duy -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: In search of a version control system
On Sun, Oct 21, 2012 at 5:50 PM, Drew Northup n1xim.em...@gmail.com wrote: On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: David Aguilar dav...@gmail.com writes: I would advise against the file locking, though. You ain't gonna need it ;-) What do you suggest to merge Word files? If the files are in the DOCX format you can just expand them as zip archives and diff what's inside of them. The text in particular is stored as XML. You also need a merge driver that at least splits the all in one single very very long line XML into different lines in some way. I don't think git can merge even text files if everything is on one line in each file. And even if you do this I don't think the result will be a valid ODT etc file. All in all, I prefer the locking that David mentioned [1]. And if your users cannot be trained to check first (as that URL describes), then you probably have to use a CVCS that supports some stronger form of locking. [1]: http://sitaramc.github.com/gitolite/locking.html -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: In search of a version control system
Ramkumar Ramachandra artag...@gmail.com writes: So, is it possible to lock a file while someone work on it ? No, and I honestly think it's a bad idea. If you work on non-mergeable files (e.g. *.doc files. There are merge tools for MS Word and LibreOffice, but my experience with them was not really pleasant), then file locking is indeed not such a bad idea. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: In search of a version control system
On Mon, Oct 8, 2012 at 11:30 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Ramkumar Ramachandra artag...@gmail.com writes: So, is it possible to lock a file while someone work on it ? No, and I honestly think it's a bad idea. If you work on non-mergeable files (e.g. *.doc files. There are merge tools for MS Word and LibreOffice, but my experience with them was not really pleasant), then file locking is indeed not such a bad idea. gitolite to the rescue: http://sitaramc.github.com/gitolite/locking.html If you want to setup a git server, look at gitolite. It's really easy and slick. I would advise against the file locking, though. You ain't gonna need it ;-) -- David -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: In search of a version control system
David Aguilar dav...@gmail.com writes: I would advise against the file locking, though. You ain't gonna need it ;-) What do you suggest to merge Word files? -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
