Re: Questions about using subversion for non-coding projects.

Carl Baldwin <cnb@fc.hp.com> writes:
> I meant to take this to another level where subversion called an
> external script if the file matches a given mime-type.

I believe 'svn merge' takes the --diff3-cmd option for this purpose.

It's unfortunate, from a user interface point of view, that the option
retains the same name it uses with 'svn diff', but still it should
have the effect you want. (Or if it doesn't, please let us know!)

-Karl

-- 
www.collab.net  <>  CollabNet  |  Distributed Development On Demand
> On Thu, Aug 25, 2005 at 05:31:13PM -0700, Erik Anderson wrote:
> > Isn't this how conflict-resolution is handled in Subversion where simple
> > text merges are simply not available?  The files are flagged as requiring
> > manual merge and the three versions of the file are available for
> > comparison...
> > 
> > -----Original Message-----
> > From: Carl Baldwin [mailto:cnb@fc.hp.com]
> > Sent: Thursday, August 25, 2005 5:29 PM
> > To: Vincent Starre
> > Cc: Jay Paulson; users@subversion.tigris.org
> > Subject: Re: Questions about using subversion for non-coding projects.
> > 
> > Hello,
> > 
> > I just had a thought.
> > 
> > I wonder if subversion could be made to defer the merging operation on
> > files with certain mime-types.  This way, subversion would merely detect
> > the need to merge a file but defer the actual work to a script or
> > something.  In the best case, it might be possible to wrap tools that
> > would attempt (hopefully successfully) to merge files like MS office
> > documents.  If nothing else, the script could tell the user that a merge
> > needs to be done and mark the working copy dirty.
> > 
> > I actually got this idea from git.  It has this sort of flexibility.
> > Actually, it will make a great back-end for this sort of use when it
> > gets a webdav interface (plus maybe autoversioning) and a neat windows
> > client.  For now, though, its not an option.
> > 
> > Carl
> > 
> > On Thu, Aug 25, 2005 at 07:01:18PM -0400, Vincent Starre wrote:
> > > I would not recommend subversion for "text"-like things which are not
> > > bare text. While svn certainly /can/ do things like this, it would treat
> > 
> > > all files as binary, so a lot (though certainly not all) of the
> > > usefulness would be gone.
> > > Word[for example] is a common enough format that I'm sure there are some
> > 
> > > version control systems which are format-aware of Word[for example]
> > files.
> > > Though I can't say with certainty, having not actually used it,
> > > "SharePoint" comes to mind.
> > >
> > > Jay Paulson wrote:
> > >
> > > >Hello all-
> > > >
> > > >I'm doing some research for many things and from reading about
> > > >subversion it might do the trick, but I still have questions.
> > > >
> > > >The company I currently work for has many different projects, however
> > > >they are not coding projects.  The projects are mainly research ones
> > > >with many documents (Word, Excell, PDF docs etc) that are used with
> > > >this research (mainly documents things about the research but usually
> > > >go through many versions before a final version is released).
> > > >
> > > >What is needed is some sort of version control system that team
> > > >members can use to share files, collaborate ideas, and basically have
> > > >a project tracker kind of like SourceForge.net.
> > > >
> > > >My question is can Subversion handle something like this with mainly
> > > >different kind of documents that aren't programs etc?  Is there a good
> > > >web interface that promotes users to collaborate?  I would prefer if
> > > >the web interface was written in PHP but if there are good ones
> > > >written in something else I'd like to see them.
> > > >
> > > >Thanks for any suggestions!
> > > >
> > > >
> > > >---------------------------------------------------------------------
> > > >To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> > > >For additional commands, e-mail: users-help@subversion.tigris.org
> > > >
> > > >
> > >
> > >
> > > ---------------------------------------------------------------------
> > > To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> > > For additional commands, e-mail: users-help@subversion.tigris.org
> > >
> > 
> > --
> > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
> >  Carl Baldwin                        Systems VLSI Laboratory
> >  Hewlett Packard Company
> >  MS 88                               work: 970 898-1523
> >  3404 E. Harmony Rd.                 work: Carl.N.Baldwin@hp.com
> >  Fort Collins, CO 80525              home: Carl@ecBaldwin.net
> > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
> > 
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> > For additional commands, e-mail: users-help@subversion.tigris.org
> 
> 
> 
> -- 
> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
>  Carl Baldwin                        Systems VLSI Laboratory
>  Hewlett Packard Company
>  MS 88                               work: 970 898-1523
>  3404 E. Harmony Rd.                 work: Carl.N.Baldwin@hp.com
>  Fort Collins, CO 80525              home: Carl@ecBaldwin.net
> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
> 
-- 
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org