Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 4603:66ed92ed115a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make fast-forward merges full merges
author Brendan Cully <brendan@kublai.com>
date Mon, 18 Jun 2007 12:38:54 -0700
parents 0912d8df5e19
children ff7253a0d1da
comparison
equal deleted inserted replaced
4602:d9d177ef748a 4603:66ed92ed115a
502 raise util.Abort(_("outstanding uncommitted merges")) 502 raise util.Abort(_("outstanding uncommitted merges"))
503 if pa == p1 or pa == p2: # is there a linear path from p1 to p2? 503 if pa == p1 or pa == p2: # is there a linear path from p1 to p2?
504 if branchmerge: 504 if branchmerge:
505 if p1.branch() != p2.branch(): 505 if p1.branch() != p2.branch():
506 fastforward = True 506 fastforward = True
507 branchmerge = False
508 else: 507 else:
509 raise util.Abort(_("there is nothing to merge, just use " 508 raise util.Abort(_("there is nothing to merge, just use "
510 "'hg update' or look at 'hg heads'")) 509 "'hg update' or look at 'hg heads'"))
511 elif not (overwrite or branchmerge): 510 elif not (overwrite or branchmerge):
512 raise util.Abort(_("update spans branches, use 'hg merge' " 511 raise util.Abort(_("update spans branches, use 'hg merge' "