equal
deleted
inserted
replaced
160 else: |
160 else: |
161 if srcf and basef: |
161 if srcf and basef: |
162 raise util.Abort(_('cannot specify both a ' |
162 raise util.Abort(_('cannot specify both a ' |
163 'source and a base')) |
163 'source and a base')) |
164 if revf and basef: |
164 if revf and basef: |
165 raise util.Abort(_('cannot specify both a' |
165 raise util.Abort(_('cannot specify both a ' |
166 'revision and a base')) |
166 'revision and a base')) |
167 if revf and srcf: |
167 if revf and srcf: |
168 raise util.Abort(_('cannot specify both a' |
168 raise util.Abort(_('cannot specify both a ' |
169 'revision and a source')) |
169 'revision and a source')) |
170 if detachf: |
170 if detachf: |
171 if not srcf: |
171 if not srcf: |
172 raise util.Abort( |
172 raise util.Abort( |
173 _('detach requires a revision to be specified')) |
173 _('detach requires a revision to be specified')) |