[Svnmerge] bug when merging within a branch that had been cut from a since deleted branch

[Kumar McMillan]

Hi.
sorry... hunted for a bug tracker, couldn't find one.  First time
using svnmerge I ran into a bug which looks like a rare edge case (but
also one that should be easy to fix).  Here is a failing test
(attached) and the traceback it exposes below.  In a nutshell: made a
branch from trunk, say "work_foo", then moved that branch to
"release_candidate_foo" ... svn merge in release_candidate_foo gets
confused because work_foo is deleted in head (specifically, `svn info
"dead_branch_url"` fails inside svnmerge.py).

PS> you will need `easy_install fixture` to run the test


Traceback (most recent call last):
  File "/Users/kumar/bin/svnmerge.py", line 1962, in ?
    main(sys.argv[1:])
  File "/Users/kumar/bin/svnmerge.py", line 1957, in main
    cmd(branch_dir, branch_props)
  File "/Users/kumar/bin/svnmerge.py", line 1451, in __call__
    return self.func(*args, **kwargs)
  File "/Users/kumar/bin/svnmerge.py", line 1125, in action_merge
    find_reflected=opts["bidirectional"])
  File "/Users/kumar/bin/svnmerge.py", line 960, in analyze_source_revs
    return analyze_revs(target_dir, source_url, base, end_rev, **kwargs)
  File "/Users/kumar/bin/svnmerge.py", line 914, in analyze_revs
    logs[url] = RevisionLog(url, begin, end, find_reflected)
  File "/Users/kumar/bin/svnmerge.py", line 297, in __init__
    repos_path = target_to_repos_relative_path(url)
  File "/Users/kumar/bin/svnmerge.py", line 754, in
target_to_repos_relative_path
    root = get_repo_root(target)
  File "/Users/kumar/bin/svnmerge.py", line 734, in get_repo_root
    return info["Repository Root"]
KeyError: 'Repository Root'
-------------- next part --------------
A non-text attachment was scrubbed...
Name: test_svnmerge_del_branch.py
Type: text/x-python
Size: 1449 bytes
Desc: not available
URL: </pipermail/svnmerge/attachments/20070417/47aaeb9e/attachment-0002.py>