equal
deleted
inserted
replaced
942 |
942 |
943 - move the '@' bookmark from another branch:: |
943 - move the '@' bookmark from another branch:: |
944 |
944 |
945 hg book -f @ |
945 hg book -f @ |
946 ''' |
946 ''' |
947 opts = pycompat.byteskwargs(opts) |
947 force = opts.get(r'force') |
948 force = opts.get('force') |
948 rev = opts.get(r'rev') |
949 rev = opts.get('rev') |
949 delete = opts.get(r'delete') |
950 delete = opts.get('delete') |
950 rename = opts.get(r'rename') |
951 rename = opts.get('rename') |
951 inactive = opts.get(r'inactive') |
952 inactive = opts.get('inactive') |
|
953 |
952 |
954 if delete and rename: |
953 if delete and rename: |
955 raise error.Abort(_("--delete and --rename are incompatible")) |
954 raise error.Abort(_("--delete and --rename are incompatible")) |
956 if delete and rev: |
955 if delete and rev: |
957 raise error.Abort(_("--rev is incompatible with --delete")) |
956 raise error.Abort(_("--rev is incompatible with --delete")) |