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.
Simon
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Nov 18 10:28:31 2004