[Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch

["Martin v. Löwis"]

> I can see how "svn resolved ." gets it right (now that I understand how
> the conflict is being produced and then fixed automatically by svnmerge,
> but not actually marked as resolved).
> 
> I still don't understand how "svn revert ." can avoid losing the
> metadata changes unless svnmerge is told to modify the properties again
> after they have been reverted. Or am I misunderstanding SVN, and the
> revert command doesn't actually revert property changes?

Oops, I meant "svn resolved ." all the time. When I wrote
"svn revert .", it was by mistake.

Regards,
Martin