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

Re: [TSVN] bug: when merging back newly added binary files, a conflict is issued

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-07-07 19:14:14 CEST

Leonard Ritter wrote:

> we've been running into some problems with tortoiseSVN recently where binary
> files such as images that have been added to a subbranch create a conflict
> when the branch is merged back into the trunk.
>
> it usually goes as this:
> - branch /trunk to /branches/newbranch
> - check out /branches/newbranch to a new directory
> - add a new binary file (test.png) to /branches/newbranch
> - commit the changes
> - merge the trunk into this branch
> - go back to the directory where you have checked out /trunk
> - merge /branches/newbranch into /trunk
>
> no conflict is being displayed in the gui, but as soon as you want to check
> in your merge, you get a conflict displayed with test.png. a zero byte file
> named test.png.r0 exists along with test.png and test.png.r<revision where
> test.png was committed>. the conflict can be solved by deleting both .r*
> files. test.png contains the intended image.
>
> note that test.png has never existed in the project before.
>
> the expected behaviour is that no conflict is generated, instead the new
> binary file is properly added to the trunk.

Please do the following:
- get the Subversion command line client
- do the merge with the CL client
It should behave exactly the same (TSVN uses the Subversion library to
do the merge, it doesn't do any merging itself).

Then, report this on the Subversion mailing list (users at
subversion.tigris.org)

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jul 7 19:14:35 2005

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