Show More
@@ -1658,10 +1658,14 b' class gitsubrepo(abstractsubrepo):' | |||
|
1658 | 1658 | def revert(self, substate, *pats, **opts): |
|
1659 | 1659 | self.ui.status(_('reverting subrepo %s\n') % substate[0]) |
|
1660 | 1660 | if not opts.get('no_backup'): |
|
1661 | self.ui.warn('%s: reverting %s subrepos without ' | |
|
1662 | '--no-backup is unsupported\n' | |
|
1663 | % (substate[0], substate[2])) | |
|
1664 | return [] | |
|
1661 | status = self.status(None) | |
|
1662 | names = status.modified | |
|
1663 | for name in names: | |
|
1664 | bakname = "%s.orig" % name | |
|
1665 | self.ui.note(_('saving current version of %s as %s\n') % | |
|
1666 | (name, bakname)) | |
|
1667 | util.rename(os.path.join(self._abspath, name), | |
|
1668 | os.path.join(self._abspath, bakname)) | |
|
1665 | 1669 | |
|
1666 | 1670 | self.get(substate, overwrite=True) |
|
1667 | 1671 | return [] |
@@ -787,14 +787,13 b' ensure adding include/exclude ignores th' | |||
|
787 | 787 | revert the subrepository |
|
788 | 788 | $ hg revert --all |
|
789 | 789 | reverting subrepo ../gitroot (glob) |
|
790 | ../gitroot: reverting git subrepos without --no-backup is unsupported (glob) | |
|
791 | 790 | |
|
792 | 791 | $ hg status --subrepos |
|
793 |
|
|
|
794 |
|
|
|
792 | ? s/barfoo | |
|
793 | ? s/foobar.orig | |
|
795 | 794 | |
|
796 | $ hg revert --no-backup --all | |
|
797 | reverting subrepo ../gitroot (glob) | |
|
795 | $ mv s/foobar.orig s/foobar | |
|
796 | ||
|
798 | 797 | $ hg revert --no-backup s |
|
799 | 798 | reverting subrepo ../gitroot (glob) |
|
800 | 799 |
General Comments 0
You need to be logged in to leave comments.
Login now