This is the message shown in the merge window in the output list:
Action | Path
--------------------------------------------------------------------------------------------
Command | Reintegrate merge https://xx.xx.xx.xx/svn/repo/branches into C:\sandboxes\repo
Error | Cannot reintegrate into mixed-revision working copy; try updating first
Finished! |
I can always reproduce this by doing the following:
1. Having already a local working copy from "trunk".
2. Use "Copy to" in repo browser to create a branch from "trunk" to svn-directory "branches".
3. Create local working copy of this branch.
4. Do the modifications and check them in.
5. Then use the "Merge" command to merge the branch to your working copy of "trunk"
This it the time, where I get the error above. I then need to do an SVN Update on the working copy of "trunk", before it is possible to merge.
Torge
Am 26.02.2011 09:50, schrieb Stefan Küng:
> On 20.02.2011 13:22, Torge Riedel wrote:
>> Hi,
>>
>> everytime I'm using the SVN merge command from TortoiseSVN it shows
>> an error that it cannot "merge into mixed" revisions. I need to call
>> "SVN Update" (and sometimes "SVN Clean Up") once to be able to merge.
>> Would be nice, if this is detected by TortoiseSVN and the user is
>> requested if an "SVN Update" should be executed.
>
> What's the exact error message?
> And is it really an error? TSVN shows a warning if there are local
> modifications before you try to merge, but that's just a warning, not an
> error.
>
> Stefan
>
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2707747
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-26 10:45:24 CET