Mercurial > hg > mercurial-crew-with-dirclash

comparison hg @ 226:1536ccac47e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: don't bail on outstanding changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: don't bail on outstanding changes With multiple heads, we don't need to worry about the working dir's uncommitted changes at pull time manifest hash: 5b4e024f220fa616732310ce5f48e71abfa910e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMFQywK+sNU5EO8RApLyAKCoNDF84wFzgnpS+WLuXdkGxeHFPwCdFsMy CysB458dNcFuB/vDFhgJr58= =gG+u -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 03 Jun 2005 12:45:04 -0800
parents ccbcc4d76f81
children f57519cddd3d
comparison
equal deleted inserted replaced
225:1651a3e61925 226:1536ccac47e9
354 if e[5] != hg.nullid: 354 if e[5] != hg.nullid:
355 print "\t%d -> %d" % (r.rev(e[5]), i) 355 print "\t%d -> %d" % (r.rev(e[5]), i)
356 print "}" 356 print "}"
357 357
358 elif cmd == "merge": 358 elif cmd == "merge":
359 (c, a, d, u) = repo.diffdir(repo.root, repo.current)
360 if c or a or d:
361 ui.warn("aborting (outstanding changes in working directory)\n")
362 sys.exit(1)
363
364 if args: 359 if args:
365 paths = {} 360 paths = {}
366 try: 361 try:
367 pf = os.path.join(os.environ["HOME"], ".hgpaths") 362 pf = os.path.join(os.environ["HOME"], ".hgpaths")
368 for l in file(pf): 363 for l in file(pf):