On 23.01.2014 06:25, Gavin Lambert wrote:
> I had a case today where I wanted to merge some revisions from a branch
> that I had already deleted previously. (Using TSVN 1.8)
>
> Following this:
>
> 1. Go to the working copy root of the destination branch.
> 2. TortoiseSVN -> Merge
> 3. Range of revisions
> 4. URL to merge from -> ..., select the appropriate peg revision and
> find the correct URL for the branch.
> 5. Click "Show log"
> 6. TSVN displays a log window but then hangs. After waiting for longer
> than it should have taken, clicking Cancel exits out of the entire merge
> operation, not just closing the log window.
>
>
> I can successfully perform the merge if I use a separate log window (eg.
> from the repo-browser) to find the appropriate revision to merge and
> then type something like "1234-1243_at_2000" into the merge range, without
> ever clicking Show Log.
>
>
> Expected results:
>
> 1. When using a non-HEAD revision when specifying the URL to merge from,
> it should remember this and pre-fill it to the revision range (or use a
> separate field for this).
> 2. When clicking Show Log it should respect the peg revision.
> 3. The log window should show a reasonable error instead of hanging, in
> the event that the URL does not exist at that revision.
try clearing the log cache from the settings dialog.
also: fetching the log from the merge dialog takes longer because there
the log dialog also fetches the merge info so it can properly show you
which revisions have already been merged. However that can take a
*really* long time if your svn server is not running a current version.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3072074
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-01-25 09:53:16 CET