Mercurial > hg
comparison hgext/rebase.py @ 15736:306e84e8bbe9
rebase: allow --detach when --rev is used
--rev is only a more specific --source and there is no reason to refuse to use
detach with it.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Tue, 27 Dec 2011 20:45:46 +0100 |
| parents | f520c9616db5 |
| children | 8edd9f2c7b57 |
comparison
equal
deleted
inserted
replaced
| 15735:5b384b7f48d5 | 15736:306e84e8bbe9 |
|---|---|
| 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 or revf): |
| 172 raise util.Abort( | 172 raise util.Abort( |
| 173 _('detach requires a revision to be specified')) | 173 _('detach requires a revision to be specified')) |
| 174 if basef: | 174 if basef: |
| 175 raise util.Abort(_('cannot specify a base with detach')) | 175 raise util.Abort(_('cannot specify a base with detach')) |
| 176 | 176 |