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

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

From: Leonard Ritter <leonard.ritter_at_steganos.com>
Date: 2005-07-12 15:08:21 CEST

Hi,

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.

Best regards,

Leonard Ritter
Development

E-Mail: leonard.ritter@steganos.com

Steganos GmbH
Freiheit Online™ - Freedom Online™ - Liberté sur Internet™
http://www.steganos.de

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jul 12 15:08:35 2005

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