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

[TSVN] BUG: Merge binary files

From: Vlad <vkorol1_at_umbc.edu>
Date: 2005-04-19 10:01:01 CEST


       Not sure if this was reported before, at least it is not in the
issue database on the tigris.org. Anyway here is
a description of the bug.

BUG: TortoiseSVN doesn't apply merge correctly when binary files were

How to replicate:

           1. Create a vendor branch /vendor/lib/current and
populate it with binary files
           2. Tag the vendor branch /vendor/lib/tag/version1
           3. Copy vendory library to the project directory
           3. Add and commit more files to /vendor/lib/current and
then commit.

           4. * BUG* When trying to merge changes From URL :
/vendor/lib/version1 to URL: /vendor/lib/current into /proj/lib/vendor
                  TortoiseSVN reports that merge was applyed ok, but
there are no new files added to the /proj/lib/vendor


                  Doing it with command line svn client works fine...

                  cd /proj/lib/
                  svn merge /vendor/lib/version1
/vendor/lib/current/ vendor
                  A file1.dll
                  A file2.dll

             So probably TortoiseSVN just takes the unified diff which
skips over binary files and tries to apply it to the vendor
             directory, which obviously doesn't work. I don't think
the quick fix is possible, but you might consider putting it up
             as a feature request for the next version...


To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Apr 19 09:12:35 2005

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

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