equal
deleted
inserted
replaced
495 base = ['null'] |
495 base = ['null'] |
496 else: |
496 else: |
497 base = opts.get('base') |
497 base = opts.get('base') |
498 if base: |
498 if base: |
499 if dest: |
499 if dest: |
500 raise util.Abort(_("--base is incompatible with specifiying " |
500 raise util.Abort(_("--base is incompatible with specifying " |
501 "a destination")) |
501 "a destination")) |
502 base = [repo.lookup(rev) for rev in base] |
502 base = [repo.lookup(rev) for rev in base] |
503 # create the right base |
503 # create the right base |
504 # XXX: nodesbetween / changegroup* should be "fixed" instead |
504 # XXX: nodesbetween / changegroup* should be "fixed" instead |
505 o = [] |
505 o = [] |