[TSVN] Re: Handling after a merge

Thomas Börkel wrote:

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

What would that diff show? Most likely it will show exactly the same
changes as it would before you did the update. The update process takes
note of your local changes, updates your working base to reflect the
newer revision, and then applies your local changes to the updated
version.

What the diff will definitely _not_ show is what changes the update
made. It is only showing _your_ changes.

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 3 10:41:24 2004