Show More
@@ -1454,7 +1454,7 b' coreconfigitem(' | |||||
1454 | coreconfigitem( |
|
1454 | coreconfigitem( | |
1455 | b'shelve', |
|
1455 | b'shelve', | |
1456 | b'store', |
|
1456 | b'store', | |
1457 | default='internal', |
|
1457 | default=b'internal', | |
1458 | experimental=True, |
|
1458 | experimental=True, | |
1459 | ) |
|
1459 | ) | |
1460 | coreconfigitem( |
|
1460 | coreconfigitem( |
@@ -102,7 +102,7 b' class ShelfDir:' | |||||
102 | def _use_internal_phase(repo): |
|
102 | def _use_internal_phase(repo): | |
103 | return ( |
|
103 | return ( | |
104 | phases.supportinternal(repo) |
|
104 | phases.supportinternal(repo) | |
105 | and repo.ui.config(b'shelve', b'store') == 'internal' |
|
105 | and repo.ui.config(b'shelve', b'store') == b'internal' | |
106 | ) |
|
106 | ) | |
107 |
|
107 | |||
108 |
|
108 |
@@ -1605,3 +1605,16 b' shelve --list --patch should work even w' | |||||
1605 | default.patch |
|
1605 | default.patch | |
1606 | default.shelve |
|
1606 | default.shelve | |
1607 | $ hg unshelve -q |
|
1607 | $ hg unshelve -q | |
|
1608 | ||||
|
1609 | Override the disabling, re-enabling phase-based shelves | |||
|
1610 | ||||
|
1611 | $ hg shelve --config shelve.store=internal -q | |||
|
1612 | ||||
|
1613 | #if phasebased | |||
|
1614 | $ hg log --hidden --template '{user}\n' | |||
|
1615 | shelve@localhost | |||
|
1616 | #endif | |||
|
1617 | ||||
|
1618 | #if stripbased | |||
|
1619 | $ hg log --hidden --template '{user}\n' | |||
|
1620 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now