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

RE: Doubt about merges

From: Lakshman Srilakshmanan <lakshman.srilakshmanan_at_tradingpost.com.au>
Date: 2006-10-02 04:22:59 CEST

Hi Leandro,

AFAIK no merge utility can merge binary files. :(

From: Leandro Silva [mailto:leandroswquality@gmail.com]
Sent: Saturday, 30 September 2006 12:38 AM
To: users@subversion.tigris.org
Subject: Doubt about merges

We have a complex environment of work where we have a product that is
composed of some modules. And we develop customizations to our clients.
Theses customizations needs to be integrated to the product and have to
be configurable (the user may choose if he wants to use this
functionality). We have different versions of our products and modules
that are running in our clients.
We use the idea that new functionalities are developed in branches and
when finished is made a merge into the trunk. When this happens, we have
a complex merge to do.
The merge is related to binary files and text files. We are insecure to
use the functionality of merge of TortoiseSVN, because of this, we use
the WinMerge. But, it is not useful to binary files.
I would like to know some strategies to do this process of merge and
personal experiences too.
Leandro de Paula Silva

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 2 05:06:47 2006

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.