Mercurial > hgsubversion
diff tests/test_fetch_branches.py @ 120:f508c1fa19a5
hg_delta_editor: do not assume branches are copied from trunk by default
Here is what happen in jquery repository:
- kelvin-dev branch is created in r1617 with an empty directory for the
datePicker plugin
- commits are done
- datePicker plugin is merged in trunk
Before the fix, the converter assumed the initial empty commit had for parent
some other commit of trunk, therefore adding all its files, which was wrong.
And we ended with 'alignDemo.html' in converted trunk@5946 while it was not in
the source revision.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sat, 29 Nov 2008 11:25:01 -0600 |
| parents | 3afe404042a3 |
| children | 4d42dbbb5127 |
line wrap: on
line diff
--- a/tests/test_fetch_branches.py +++ b/tests/test_fetch_branches.py @@ -14,8 +14,8 @@ class TestFetchBranches(test_util.TestBa heads = [repo[n] for n in repo.heads()] heads = dict([(ctx.branch(), ctx) for ctx in heads]) # Let these tests disabled yet as the fix is not obvious - #self.assertEqual(heads['branch1'].manifest().keys(), ['b']) - #self.assertEqual(heads['branch2'].manifest().keys(), ['a', 'b']) + self.assertEqual(heads['branch1'].manifest().keys(), ['b']) + self.assertEqual(heads['branch2'].manifest().keys(), ['a', 'b']) def test_unrelatedbranch_stupid(self): self.test_unrelatedbranch(True)