RE: [TSVN] Handling after a merge

HI!

> > After a merge, I get a merge dialog, where I can see, what has been
> > updated and what was conflicted.
> >
> > When I double-click on a conflicted file, I get the conflict editor.
> > After solving the conflict, I still have to go to the Windows
> > Explorer and choose "Resolved" on the conflicted files.
>
> Settings dialog. There you'll see an option to automatically
> resolve a
> conflict when saving. Activate that and you're fine.

OK, thanks.
 
> > If I want to see, what the merge has changed on the non-conflicted
> > files (diff), I also have to go to the Windows Explorer.
> >
> > I'd like to suggest the following productivity enhancements for the
> > after-merge-dialog:
> >
> > 1. Double-click on a non-conflicted ("updated") file should show the
> > visual diff.
>
> Not possible! "Updated" means that both the file in your working copy
> _and_ the file in your working copy base changed identically. There's
> nothing to diff there.

I see. But then TSVN 1.1.1 shows the wrong status in that dialog. I *think*, I saw also the status "merged" in 1.1.0 for some files there.

I just did a merge to test (checked out the head revision into a fresh folder first) and the dialog shows some files as "conflicted" and the rest as "updated". But most (not all) of those "updated" files show a "!" in the Windows Explorer and I can diff them there against the working base (head revision).

Thomas

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 3 09:52:26 2004