[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: Norbert Unterberg <nunterberg_at_gmail.com>
Date: 2005-08-04 23:26:37 CEST

2005/8/4, SteveKing <steveking@gmx.ch>:

> > 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

I've got a reproduction recipe:

-----branch.cmd-------snip-----
set repos=file:///c:/xx/repo

if exist repo rd /s /q repo
if exist wc rd /s /q wc
if exist wc2 rd /s /q wc2

svnadmin create repo
md layout
md layout\trunk
md layout\trunk\dir1
md layout\branches
svn import layout %repos% -m "created layout"
rd /s /q layout

svn co %repos%/trunk wc

echo line1 > wc\dir1\test1.txt
echo line1 > wc\dir1\test2.txt
svn add wc\dir1\*
svn ci wc -m "created test files"
svn up wc
echo line2 >> wc\dir1\test2.txt

svn co %repos%/trunk wc2
echo line3 >> wc2\dir1\test2.txt
svn ci wc2 -m "added line3"

rem WC is modified, now create the branch
svn cp wc %repos%/branches/test -m "create branch from wc"
--------snip--------

Create an empty folder c:\xx
Copy the branch.cmd file into that folder
Run the branch.cmd script.
Point your repo browser to file:///c:/xx/repo/branches/test
Right click on the "test" folder and "show log".
Select revision 4
Double click the "Modified: /branches/test/dir/test2.txt" line in the file list.

--> Error message: File not found: revision 3, path
'/branches/test/dir1/test2.txt'

Norbert

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Aug 4 23:28:50 2005

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