equal
deleted
inserted
replaced
360 ) % (divergent, TROUBLES['CONTENTDIVERGENT'], othersstr) |
360 ) % (divergent, TROUBLES['CONTENTDIVERGENT'], othersstr) |
361 ui.write_err(msg) |
361 ui.write_err(msg) |
362 return (False, '') |
362 return (False, '') |
363 other = others[0] |
363 other = others[0] |
364 evolvestate['other-divergent'] = other.node() |
364 evolvestate['other-divergent'] = other.node() |
|
365 evolvestate['base'] = base.node() |
365 |
366 |
366 # we don't handle merge content-divergent changesets yet |
367 # we don't handle merge content-divergent changesets yet |
367 if len(other.parents()) > 1: |
368 if len(other.parents()) > 1: |
368 msg = _("skipping %s: %s changeset can't be " |
369 msg = _("skipping %s: %s changeset can't be " |
369 "a merge (yet)\n") % (divergent, TROUBLES['CONTENTDIVERGENT']) |
370 "a merge (yet)\n") % (divergent, TROUBLES['CONTENTDIVERGENT']) |
1390 tr = None |
1391 tr = None |
1391 try: |
1392 try: |
1392 tr = repo.transaction('evolve') |
1393 tr = repo.transaction('evolve') |
1393 divergent = evolvestate['divergent'] |
1394 divergent = evolvestate['divergent'] |
1394 other = evolvestate['other-divergent'] |
1395 other = evolvestate['other-divergent'] |
|
1396 base = evolvestate['base'] |
1395 repo = repo.unfiltered() |
1397 repo = repo.unfiltered() |
1396 ret = _completecontentdivergent(ui, repo, progresscb, |
1398 ret = _completecontentdivergent(ui, repo, progresscb, |
1397 repo[divergent], |
1399 repo[divergent], |
1398 repo[other], |
1400 repo[other], |
1399 evolvestate) |
1401 evolvestate) |