equal
deleted
inserted
replaced
1738 backup = 'all' |
1738 backup = 'all' |
1739 if opts['backup']: |
1739 if opts['backup']: |
1740 backup = 'strip' |
1740 backup = 'strip' |
1741 elif opts['nobackup']: |
1741 elif opts['nobackup']: |
1742 backup = 'none' |
1742 backup = 'none' |
1743 repo.mq.strip(repo, rev, backup=backup) |
1743 update = repo.dirstate.parents()[0] != revlog.nullid |
|
1744 repo.mq.strip(repo, rev, backup=backup, update=update) |
1744 return 0 |
1745 return 0 |
1745 |
1746 |
1746 def select(ui, repo, *args, **opts): |
1747 def select(ui, repo, *args, **opts): |
1747 '''set or print guarded patches to push |
1748 '''set or print guarded patches to push |
1748 |
1749 |