Mercurial > hg
comparison tests/test-subrepo-git.t @ 23678:194d2f185008
subrepo: add full revert support for git subrepos
Previously, revert was only possible if the '--no-backup'
switch was specified.
Now, to support backups, we explicitly go over all modified
files in the subrepo.
| author | Mathias De Maré <mathias.demare@gmail.com> |
|---|---|
| date | Sun, 28 Dec 2014 10:42:25 +0100 |
| parents | 7651621507cf |
| children | 9a02f7517939 |
comparison
equal
deleted
inserted
replaced
| 23677:6bc1702e7333 | 23678:194d2f185008 |
|---|---|
| 785 $ hg diff --subrepos -X s/foobar | 785 $ hg diff --subrepos -X s/foobar |
| 786 | 786 |
| 787 revert the subrepository | 787 revert the subrepository |
| 788 $ hg revert --all | 788 $ hg revert --all |
| 789 reverting subrepo ../gitroot (glob) | 789 reverting subrepo ../gitroot (glob) |
| 790 ../gitroot: reverting git subrepos without --no-backup is unsupported (glob) | |
| 791 | 790 |
| 792 $ hg status --subrepos | 791 $ hg status --subrepos |
| 793 M s/foobar | 792 ? s/barfoo |
| 794 A s/barfoo | 793 ? s/foobar.orig |
| 795 | 794 |
| 796 $ hg revert --no-backup --all | 795 $ mv s/foobar.orig s/foobar |
| 797 reverting subrepo ../gitroot (glob) | 796 |
| 798 $ hg revert --no-backup s | 797 $ hg revert --no-backup s |
| 799 reverting subrepo ../gitroot (glob) | 798 reverting subrepo ../gitroot (glob) |
| 800 | 799 |
| 801 $ hg status --subrepos | 800 $ hg status --subrepos |
| 802 ? s/barfoo | 801 ? s/barfoo |