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

RE: Merging in Subversion

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Tue, 1 Feb 2011 10:49:12 -0500

> > . Is there any best way to merge files in SVN or you need to
> > incorporate any strong merging tool?
> Text files are handled well by SVN's builtin merging capabilities.
> For other
> files, I don't know how to merge them. In practice, I consider
> anything
> non-textual as non-mergable, too. This means that merging requires
> manual aid
> (unless the base version of both branches is equal, in that case
> SVN does the
> job automatically) and that the "needs-lock" property is always
> set.

In our shop the policy is that if a fix is made in a version to a binary file, that same fix is applied to higher versions. This is usually an issue with reports since we use crystal the .rpt files are binary. It seems to work for us but may not work for others. If only every file could be textual... ;)


Received on 2011-02-01 16:49:54 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.