On Wed, Aug 13, 2008 at 10:53 AM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> Robert Dailey wrote:
>
>> Hi,
>>
>> I've noticed that the Reintegrate option (middle option) in the Merge
>> dialog is still broken. When attempting to merge you get a pretty long error
>> message stating that there's still unmerged changes or something. I thought
>> this was fixed in 1.5.1. <http://1.5.1.> Does anyone have any news on
>> this?
>>
>
> What's the exact error message? You can get the message back from the log:
> Settings->Saved Data->Action log->Show
Here you go. I apologize for not having provided this to begin with:
8/13/2008 - 10:44:33 AM
Command : Reintegrate merge
http://teamserver:1337/svn/vfxrepo/vfx/branches/mike into
C:\vfxrepo\vfx\mike
Error : Cannot reintegrate from '
http://teamserver:1337/svn/vfxrepo/vfx/branches/mike' yet:
Error : Some revisions have been merged under it that have
not been merged
Error : into the reintegration target; merge them first, then
retry.
Finished! :
Received on 2008-08-13 20:59:47 CEST