Mercurial > hg > pyhgsh

comparison hg @ 65:d40cc5aacc31 0.4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix up a bunch of bugs in the new merge code Move getchangegroup/addchangegroup to generators
author mpm@selenic.com
date Fri, 13 May 2005 11:47:16 -0800
parents b3e2ddff0159
children a182f2561c8e
comparison
equal deleted inserted replaced
64:b3e2ddff0159 65:d40cc5aacc31
280 hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5])) 280 hg.hex(e[4][:5]), hg.hex(e[5][:5]), hg.hex(e[6][:5]))
281 281
282 elif cmd == "merge": 282 elif cmd == "merge":
283 if args: 283 if args:
284 other = hg.repository(ui, args[0]) 284 other = hg.repository(ui, args[0])
285 print "retrieving changegroup" 285 print "requesting changegroup"
286 cg = repo.getchangegroup(other) 286 cg = repo.getchangegroup(other)
287 repo.addchangegroup(cg) 287 repo.addchangegroup(cg)
288 else: 288 else:
289 print "missing source repository" 289 print "missing source repository"
290 290