HI!
"Simon Large" <slarge@blazepoint.co.uk> wrote in message
news:cnhpve$4g3$1@sea.gmane.org...
> Thomas Börkel wrote:
> > Any further advice on this? The working copy was up-to-date before
> > the merge (no changes from me). After the merge, "updated" files are
> > of course different from the working base and so show a "!" in
> > Windows Explorer. So, it would be nice to see the diff by
> > double-click on the updated files in the after-merge-dialog.
> >> "merged" is not "updated". When a file gets merged, then it has
> >> modifications against the working copy base. But these are _your_
> >> modifications to the file before the update, not the ones merged in
> >> from the repository.
> > OK. Still, most of those "updated" files show a "!" in Windows
> > Explorer and can be diffed there against the working base. Why not
> > from the after-merge-dialog?
>
> There still seems to be a confusion of terms here. If you want to take
> this any further you will need to make a note of exactly what you are
> doing and the exact messages which come up. As Stefan said, files which
> are just plain 'updated' are _not_ marked '!' in your working copy and
> cannot be diffed. If that really is happening then it is a bug and you
> need to provide a reproduction recipe.
Here are the exact repro steps:
- create directory "C:\tsvnrepro"
- create FSFS repository there
- allow anon read/write in svnserve.conf
- svnserve --daemon --listen-port 4711 --foreground --root D:\tsvnrepro
- create folder "/test1"
- checkout "test1"
- create text file "test.txt" in local folder "test1" with one line of text
- add "test.txt" to repository and commit
- in Repo-Browser, copy "/test1" to "/test2"
- add another line of text to "test1/test.txt" and commit
- checkout "test2"
- merge from "/test1/test.txt", rev 2 to rev 4 (To = Use From URL) into
working copy test2/test.txt
- after-merge dialog says "Update", but Windows Explorer shows "!"
(correctly), because the 2nd line of text was added to "test2/test.txt"
So, I should be able to get the same diff by clicking on the file in the
after-merge dialog.
Thomas
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Nov 19 10:03:28 2004