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

Re: [TSVN] Problem: Branch from working copy with modified files

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-08-04 22:04:09 CEST

Norbert Unterberg wrote:
> I think this has been discussed some time ago, but I am asking again
> since I do not find the old mails...
>
> When I create a branch from my working copy with modified files, then
> I get a revision with branch creation and file changes in one atomic
> commit. This is nice.
>
> But the problem is, that TSVN can not do much with that revision:
> * The log window can not show the differences of the modified files
> * The merge window can not merge these differences to trunk
>
> Error message in both cases is:
>
> 'REPORT request failed on '/path/to/file.c'
> '/path/to/file.c'
> path not found
>
> The command line commands
> svn merge -r658:659 http://repos/branch/path/ .
> svn diff -r658:659 http://repos/branch/path/to/file.c

Ahem: do you show the log of your working copy switched to that branch?
Or is your working copy still on trunk?

- in which revision did you create the branch?
- on what revision do you right click in the log dialog to do those actions?

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Aug 4 22:05:18 2005

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