[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Locking functional spec: read-only WC

From: Ph. Marek <philipp.marek_at_bmlv.gv.at>
Date: 2004-10-14 13:38:13 CEST

> > some such) and then svn should do the merge by using a special program

> Sorry, that argument won't wash. While it may be theoretically possible
> to produce a merge tool for every imaginable file type, in practice most
> people don't have them, which is why they want locking.
That's true. But I don't think you're able to modify MSWord-Files without
Microsoft Office (or KOffice, or OpenOffice, etc.) ... so it seems reasonable
to have the tools that are needed for my work available.
Even MSWord has a feature which claims to merge two word files (although I've
never tested, of course)

So, to get back:
If I need a special program to edit file X (image manipulation, some kind of
office, ... even .tar-files would be possible) AND I'd like to do version
controlling AND I'd like to have parallel editing THEN I'll need some tool to
merge, or I'll have to do the merge by hand.

I'm aware that it won't be possible to have every merge program available
everywhere ... all I'd like to get through is there should be a possibility
to call external programs depending on the mime-type for merge and diff.

> Also, the whole point about using text-based files format is that they
> are easy to edit using any text editor, which makes them accessible to
> anyone. Relying on special purpose merge tools negates that
> accessibility.
That's correct.

> However, over a period of time the indentation
> had become completely messed up, and some of the text required
> re-wrapping to fit a sensible width.
But "any text editor" (which I take to be eg. notepad) doesn't do this :-)

Of course, I buy your point.
BUT: I need some tools to modify some data - I *should* be allowed to get the
corresponding merge tools, if there are any.

Locking is needed - for file-formats which have no merge tools (installed), or
when a path should not be changed ... possibly we could burn the "don't
modify tags"-problem here too - just lock
the /tags/xxx-directory-tree ... :-)

Regards,

Phil

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 14 13:38:48 2004

This is an archived mail posted to the Subversion Dev mailing list.