equal
deleted
inserted
replaced
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 |