fix some versioning related bugs and add tests

add tests for tag conflict resolution

add more metatests: move with metadata and directory metadata

(0) -300 -100 -30 -10 -3 +3 +10 +30 +100 tip

mercurial