File Locking
Mathieu Clabaut
mathieu.clabaut at gmail.com
Wed Oct 8 07:35:11 UTC 2008
On Wed, Oct 8, 2008 at 7:19 AM, Michael Smith
<michael.smith at thalesatm.com>wrote:
> Derek Scherger wrote:
> >
> > On Tue, Oct 7, 2008 at 8:29 PM, Michael Smith
> > <michael.smith at thalesatm.com <mailto:michael.smith at thalesatm.com>>
> wrote:
> >
> > Ian Lewis wrote:
> > > What about maintaining the binary files in a centralized svn
> > repo and
> > > the code in a mercurial repo? Or just maintain everything in svn
> > or some
> > > other centralized version control. If branching is not something
> > you do
> > > then using mercurial doesn't make sense. The whole point of using
> > > distributed version control is that you can branch easily.
> >
> >
> > The real answer is for tool vendors to stop unnecessarily recording
> > their output as binary files and to come up with stable, textual
> > formats using things like xml, json, yaml, svg, etc. MS Visual Studio
> > for example does use xml files, which are mostly workable, but it does
> > frequently reorder things making changes larger than they need to be
> > and somewhat harder to merge. Any tool that simultaneously claims to
> > be "enterprise class" and records its output in binary (thus
> > non-mergeable) form is an oxymoron and should be avoided if at all
> > possible.
> Yes, though I am not convinced that it is always going to be possible to
> manually merge formats like svg.
You may have a look at 3dm : http://tdm.berlios.de/3dm/doc/index.html
I'm beginning to use it for merging xml storage of event-b formal models (
http://www.event-b.org), and it works well when there are no conflicts.
You'll see in its sample repository how it is able to do some successfull 3
way merge of svg.
There may be place for a lot of improvement, but it is still a lot better
than simple file merges.
-mathieu
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20081008/707196a6/attachment-0001.html>
More information about the Mercurial
mailing list