Re: In search of a version control system

2012-10-21 Thread Sitaram Chamarty
On Sun, Oct 21, 2012 at 5:50 PM, Drew Northup wrote: > On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy > wrote: >> David Aguilar 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

Re: In search of a version control system

2012-10-21 Thread Nguyen Thai Ngoc Duy
On Sun, Oct 21, 2012 at 7:20 PM, Drew Northup wrote: > On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy > wrote: >> David Aguilar 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

Re: In search of a version control system

2012-10-21 Thread Drew Northup
On Tue, Oct 9, 2012 at 1:58 AM, Matthieu Moy wrote: > David Aguilar 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

Re: In search of a version control system

2012-10-08 Thread Matthieu Moy
David Aguilar 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.

Re: In search of a version control system

2012-10-08 Thread David Aguilar
On Mon, Oct 8, 2012 at 11:30 AM, Matthieu Moy wrote: > Ramkumar Ramachandra 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

Re: In search of a version control system

2012-10-08 Thread Matthieu Moy
Ramkumar Ramachandra 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)