changeset 25713 | 2ca116614cfc |
parent 25712 | 8a6264a2ee60 |
child 25774 | 4f8c20fe66f0 |
--- a/tests/test-shelve.t Wed Jul 01 13:13:02 2015 -0700 +++ b/tests/test-shelve.t Wed Jul 01 13:14:03 2015 -0700 @@ -5,6 +5,8 @@ > [defaults] > diff = --nodates --git > qnew = --date '0 0' + > [shelve] + > maxbackups = 2 > EOF $ hg init repo @@ -248,6 +250,14 @@ c R b/b +ensure old shelve backups are being deleted automatically + + $ ls .hg/shelve-backup/ + default-01.hg + default-01.patch + wibble.hg + wibble.patch + cause unshelving to result in a merge with 'a' conflicting $ hg shelve -q