Re: bug report

On Monday 16 February 2009, Yuriy Cherepko wrote:

> bug with new file addition with patch applying
> (TortoiseSVN 1.5.6, Build 14908 - 32 Bit , 2008/12/20)
>
> - add new *.h and *.cpp files to a project;
> - update this files (add any code);
> - create the patch;

Now the patch contains instructions to edit some files and add
others. Because of the limited capabilities of Subversion diff
output, the "add files" appears as inserting the whole contents
of the file into an empty original.

> - revert the changes (without directory changes reverting and without delete of the added files)

That's reverting some changes, but not all. It doesn't match what
the patch file contains.

> - apply the patch

So you should expect the un-reverted edits -- the deletes -- to
happen twice.

> As result, we have a duplicated code in both added files

I think this is exactly the expected result. If you didn't want
the duplication, revert everything including the directory
changes such as the creation of new files.

  - Mark.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1170078

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-16 12:07:54 CET