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

Re: Reintegrate option still broken?!

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 13 Aug 2008 17:53:36 +0200

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

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net

Received on 2008-08-13 17:53:54 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.