[SVN-2869] multiple pathid formats

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: ---
• Fix Version/s: 1.7.0
• Component/s: contrib/svnmerge.py
• Assignee: Subversion Importer
• Reporter: Subversion Importer
• Created: 09/Aug/07 17:31
• Updated: 27/Oct/18 16:28
• Resolved: 19/Sep/12 16:26

Description

This is the final patch in the pathid saga.  The end result is that merges between repositories are 
completely supported (within the capability of svn itself), even when the repository-relative path is the 
same for the source and destination.

This is a rollup of what used to be two patches; the first was in bug 2862 (cleanup_abstraction.path), 
and the second implemented the multiple pathids.  This depends on the patch from bug 2863.

[[[
* svnmerge.py
  (PathIdentifier): new class
  (RevisionLog.__init__): extract repo_relative_path from pathid
  (dict_from_revlist_prop): recognize string forms of pathids
  (format_merge_props): use '%s' to force pathids to strings
  (is_url): add an optional validity check for URLs
  (is_pathid, pathid_hint, target_to_pathid): new functions
  (get_copyfrom): extract repo_relative_path from pathid, use '%s'
    to force pathids to strings
  (check_old_prop_version): removed
  (action_init): use pathids
  (action_integrated, action_rollback): remove call to 
    check_old_prop_version
  (common_opts, command_table): new options
  (main): use pathids, set up hints
* svnmerge_test.py:
  (TestCase_PathIdentifier): new test class
  (TestCase_SvnMerge.svnmerge2): clear new caches between runs
  (testUninitForce, testBidirectionalMergesMultiBranch): allow properties
    to come back in arbitrary order
  (test_dict_from_revlist_prop, test_pathid_fns, test_pathid_hint_url,
    test_is_pathid): new tests
* svnmerge.README:
  describe new functionality
]]]

Original issue reported by dustin

Issue Links

• is duplicated by: SVN-2862 cleanup pathid abstraction