equal
deleted
inserted
replaced
13 |
13 |
14 def _destmergebranch(orig, repo, action='merge', sourceset=None, |
14 def _destmergebranch(orig, repo, action='merge', sourceset=None, |
15 onheadcheck=True, destspace=None): |
15 onheadcheck=True, destspace=None): |
16 # XXX: take destspace into account |
16 # XXX: take destspace into account |
17 if sourceset is None: |
17 if sourceset is None: |
18 p1 = repo['.'] |
18 p1 = repo['.'] |
19 else: |
19 else: |
20 # XXX: using only the max here is flacky. That code should eventually |
20 # XXX: using only the max here is flacky. That code should eventually |
21 # be updated to take care of the whole sourceset. |
21 # be updated to take care of the whole sourceset. |
22 p1 = repo[max(sourceset)] |
22 p1 = repo[max(sourceset)] |
23 top = p1.topic() |
23 top = p1.topic() |
24 if top: |
24 if top: |
25 revs = repo.revs('topic(%s) - obsolete()', top) |
25 revs = repo.revs('topic(%s) - obsolete()', top) |
26 deps, rdeps = builddependencies(repo, revs) |
26 deps, rdeps = builddependencies(repo, revs) |
27 heads = [r for r in revs if not rdeps[r]] |
27 heads = [r for r in revs if not rdeps[r]] |