[Python-Dev] [Python-checkins] Merging to the 3.0 maintenance branch
Nick Coghlan
ncoghlan at gmail.com
Sat Jan 31 06:00:49 CET 2009
Martin v. Löwis wrote:
> See above. You claim that doing things the way I recommend will lose
> metadata; I believe this claim is false.
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?
Cheers,
Nick.
--
Nick Coghlan | ncoghlan at gmail.com | Brisbane, Australia
---------------------------------------------------------------
More information about the Python-Dev
mailing list