equal
deleted
inserted
replaced
9 util, |
9 util, |
10 ) |
10 ) |
11 |
11 |
12 def _destmergebranch(orig, repo, action='merge', sourceset=None, |
12 def _destmergebranch(orig, repo, action='merge', sourceset=None, |
13 onheadcheck=True, destspace=None): |
13 onheadcheck=True, destspace=None): |
|
14 # XXX: take destspace into account |
14 p1 = repo['.'] |
15 p1 = repo['.'] |
15 top = p1.topic() |
16 top = p1.topic() |
16 if top: |
17 if top: |
17 heads = repo.revs('heads(topic(.)::topic(.))') |
18 heads = repo.revs('heads(topic(.)::topic(.))') |
18 if p1.rev() not in heads: |
19 if p1.rev() not in heads: |