[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 22:30:31 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

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

Hmm, I thought it was obvious, because it happens whenever you branch
a working copy with modifications. I showed the log from the
repository browser, pointing at the branch. The log contains just one
revision, the one that created the branch.

I'll create a reproduction recipe.

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

The WC was on revision 658 with modifications. Creating the branch
produced revision 659. Showing the log from the repobrower on the
branch only shows revision 659 because stop-on-copy is on. I then
doubleclicked on one of the modified files in the log window's file
list.

I just can't duplicate here (I have 1.2.0 at home), I just install
1.2.1 and try again.

Thanks for you efforts!

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 22:30:49 2005

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