equal
deleted
inserted
replaced
382 raise util.Abort(_("outstanding uncommitted merges")) |
382 raise util.Abort(_("outstanding uncommitted merges")) |
383 if pa == p1 or pa == p2: # is there a linear path from p1 to p2? |
383 if pa == p1 or pa == p2: # is there a linear path from p1 to p2? |
384 if branchmerge: |
384 if branchmerge: |
385 raise util.Abort(_("there is nothing to merge, just use " |
385 raise util.Abort(_("there is nothing to merge, just use " |
386 "'hg update' or look at 'hg heads'")) |
386 "'hg update' or look at 'hg heads'")) |
387 elif not branchmerge: |
387 elif not (overwrite or branchmerge): |
388 if not overwrite: |
388 raise util.Abort(_("update spans branches, use 'hg merge' " |
389 if wc.files(): |
389 "or 'hg update -C' to lose changes")) |
390 raise util.Abort(_("outstanding uncommited changes, use " |
|
391 "'hg update -C' to lose changes")) |
|
392 else: |
|
393 overwrite = True |
|
394 if branchmerge and not forcemerge: |
390 if branchmerge and not forcemerge: |
395 if wc.modified() or wc.added() or wc.removed(): |
391 if wc.modified() or wc.added() or wc.removed(): |
396 raise util.Abort(_("outstanding uncommitted changes")) |
392 raise util.Abort(_("outstanding uncommitted changes")) |
397 |
393 |
398 ### calculate phase |
394 ### calculate phase |