Submitter | phabricator |
---|---|
Date | July 27, 2019, 4:11 a.m. |
Message ID | <differential-rev-PHID-DREV-4gmfstxxl5pwmswlpqk7-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/41087/ |
State | Superseded |
Headers | show |
Comments
pulkit added inline comments. INLINE COMMENTS > test-shelve.t:1476 > + > + $ hg shelve --list > + default (1s ago) changes to: add B to foo Can you show what the new shelve contains? Also add a test when there is partial unshelving going. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6699/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6699 To: navaneeth.suresh, #hg-reviewers Cc: pulkit, mercurial-devel
pulkit added a comment. You are already working on improving things with `--keep` and `--interactive`, so let's have this patch as a part of that patch. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6699/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6699 To: navaneeth.suresh, #hg-reviewers Cc: pulkit, mercurial-devel
pulkit added inline comments. INLINE COMMENTS > shelve.py:971 > + if interactive and opts.get('keep'): > + raise error.Abort(_('--keep on interactive is not yet supported')) > `--keep on --interactive ...` REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6699/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6699 To: navaneeth.suresh, #hg-reviewers Cc: pulkit, mercurial-devel
This revision is now accepted and ready to land. pulkit added inline comments. pulkit accepted this revision. INLINE COMMENTS > shelve.py:970 > basename = shelved[0] > + if interactive and opts.get('keep'): > + raise error.Abort(_('--keep on --interactive is not yet supported')) Sorry for missing this earlier, let's move this check above. Maybe before line 944 on this side. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6699/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6699 To: navaneeth.suresh, #hg-reviewers, pulkit Cc: pulkit, mercurial-devel
Herald added a subscriber: mercurial-patches. ryancoop987 added a comment. Nice to follow the here this latest free games klondike solitaire <https://solitaire-klondike.net> it is the best way for players REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6699/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6699 To: navaneeth.suresh, #hg-reviewers, pulkit Cc: mercurial-patches, ryancoop987, pulkit, mercurial-devel
alomax added a comment. The motive of providing accounts of all ranges on our platform is to give customers what they demand and what they deserve. [url=https://csgosmurfnation.com/]csgo accounts[/url] [url=https://csgosmurfnation.com/csgo-prime-accounts/]csgo prime accounts[/url] [url=https://csgosmurfnation.com/product/rust-accounts/]rust accounts for sale[/url] [url=https://csgosmurfnation.com/valorant-accounts/]buy valorant accounts[/url] [url=https://csgosmurfnation.com/csgo-high-tier-accounts/]high tier csgo accounts[/url] REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6699/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6699 To: navaneeth.suresh, #hg-reviewers, pulkit Cc: alomax, mercurial-patches, ryancoop987, pulkit, mercurial-devel
alomax added a comment. The motive of providing accounts of all ranges on our platform is to give customers what they demand and what they deserve.<br> buy csgo accounts <https://csgosmurfnation.com/> cheap csgo prime accounts <https://csgosmurfnation.com/csgo-prime-accounts/> csgo accounts with medals <https://csgosmurfnation.com/csgo-high-tier-accounts/> valorant accounts for sale <https://csgosmurfnation.com/valorant-accounts/> gta 5 modded accounts <https://csgosmurfnation.com/valorant-accounts/> REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6699/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6699 To: navaneeth.suresh, #hg-reviewers, pulkit Cc: alomax, mercurial-patches, ryancoop987, pulkit, mercurial-devel
alomax added a comment. The motive of providing accounts of all ranges on our platform is to give customers what they demand and what they deserve.<br> buy csgo accounts <https://csgosmurfnation.com/> cheap csgo prime accounts <https://csgosmurfnation.com/csgo-prime-accounts/> csgo accounts with medals <https://csgosmurfnation.com/csgo-high-tier-accounts/> valorant accounts for sale <https://csgosmurfnation.com/valorant-accounts/> gta 5 modded accounts <https://csgosmurfnation.com/gta-5-accounts/> REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6699/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6699 To: navaneeth.suresh, #hg-reviewers, pulkit Cc: alomax, mercurial-patches, ryancoop987, pulkit, mercurial-devel
icemanwork18 added a comment. Where to Buy[[ https://www.buyprimeaccount.com/ | CSGO Prime Accounts ]]?. Buy CSGO Prime Account online for an affordable price and start your quality CSGO career. This gives you an excellent possibility of moving ahead in the game. You can select accounts that are at different ranks, that have miscellaneous kinds of skin, those with the most success ratio, and substantially more. It is very much like glancing for your patronage CSGO Service Medal account. You can get the new accounts as per your choice, and once you finalize the account, you will be encouraged to make the payment by sending the account details to your email id. It is 100% safe and secure. Once you make the payment, your gaming career will start in Counter-Strike, and you will reach a new higher level. Firstly, A Prime ranked Account of CSGO is one that has already completed hours of play. It is the one that has covered so much activity and surpassed a long winning streak. Secondly, all you need to do is buy the account from our marketplace and start gaming. The conclusion is that buying a csgo ranked account will save a lot of time and lots of energy. You will also get the higher rank teammates who are like experienced players, and playing along with them makes the day perfect. So, For this, you need to spend a few dollars and grab a CSGO that will help you cross all those hackers and cheaters and help you play the game with a lot of enjoyment & Fair. https://www.buyprimeaccount.com/ REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6699/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6699 To: navaneeth.suresh, #hg-reviewers, pulkit Cc: icemanwork18, alomax, mercurial-patches, ryancoop987, pulkit, mercurial-devel
icemanwork18 added a comment. Where to Buy CSGO Prime Accounts?. Buy CSGO Prime Account online for an affordable price and start your quality CSGO career. This gives you an excellent possibility of moving ahead in the game. You can select accounts that are at different ranks, that have miscellaneous kinds of skin, those with the most success ratio, and substantially more. It is very much like glancing for your patronage CSGO Service Medal account. You can get the new accounts as per your choice, and once you finalize the account, you will be encouraged to make the payment by sending the account details to your email id. It is 100% safe and secure. Once you make the payment, your gaming career will start in Counter-Strike, and you will reach a new higher level. Firstly, A Prime ranked Account of CSGO is one that has already completed hours of play. It is the one that has covered so much activity and surpassed a long winning streak. Secondly, all you need to do is buy the account from our marketplace and start gaming. The conclusion is that buying a csgo ranked account will save a lot of time and lots of energy. You will also get the higher rank teammates who are like experienced players, and playing along with them makes the day perfect. So, For this, you need to spend a few dollars and grab a CSGO that will help you cross all those hackers and cheaters and help you play the game with a lot of enjoyment & Fair. https://www.buyprimeaccount.com https://www.csgoprimeaccount.com REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D6699/new/ REVISION DETAIL https://phab.mercurial-scm.org/D6699 To: navaneeth.suresh, #hg-reviewers, pulkit Cc: icemanwork18, alomax, mercurial-patches, ryancoop987, pulkit, mercurial-devel
Patch
diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -1420,7 +1420,7 @@ #endif - $ hg unshelve --continue <<EOF + $ hg unshelve --continue --keep <<EOF > y > y > EOF @@ -1437,3 +1437,6 @@ (enter ? for help) [Ynesfdaq?] y unshelve of 'default-01' complete + $ hg shelve --list + default-01 (1s ago) changes to: add A to bars + default (1s ago) changes to: add B to foo