+ Evolve: Shared Mutable History ¶ +

+ Contents +

+ Evolve: Shared Mutable History +
- + Sharing with a single developer +
  - + Publishing and non-publishing repositories +
  - + Setting up +
  - + Example 1: Amend a shared changeset +
  - + Example 2: Amend again, locally +
  +
- + Sharing with multiple developers: code review +
  - + Setting up +
  - + Example 3: Alice commits and amends a draft fix +
  - + Example 4: Bob implements and publishes a new feature +
  - + Example 5: Alice integrates and publishes +
  +
- + Getting into trouble with shared mutable history +
  - + Setting up +
  - + Example 6: Divergent changesets +
  - + Phase-divergence: when a rewritten changeset is made public +
  +
- + Conclusion +
+

+ Once you have mastered the art of mutable history in a single repository (see the user guide), you can move up to the next level: shared mutable history. evolve lets you push and pull draft changesets between repositories along with their obsolescence markers. This opens up a number of interesting possibilities. +

+ The simplest scenario is a single developer working across two computers. Say you’re working on code that must be tested on a remote test server, probably in a rack somewhere, only accessible by SSH, and running an “enterprise-grade” (out-of-date) OS. But you probably prefer to write code locally: everything is setup the way you like it, and you can use your preferred editor, IDE, merge/diff tools, etc. +

+ Traditionally, your options are limited: either +

+
+
+
(ab)use your source control system by committing half-working code in order to get it onto the remote test server, or +
+
go behind source control’s back by using rsync (or similar) to transfer your code back-and-forth until it is ready to commit +
+
+
+

+ The former is less bad with distributed version control systems like Mercurial, but it’s still far from ideal. (One important version control “best practice” is that every commit should make things just a little bit better, i.e. you should never commit code that is worse than what came before.) The latter, avoiding version control entirely, means that you’re walking a tightrope without a safety net. One accidental rsync in the wrong direction could destroy hours of work. +

+ Using Mercurial with evolve to share mutable history solves these problems. As with single-repository evolve, you can commit whenever the code is demonstrably better, even if all the tests aren’t passing yet—just hg amend when they are. And you can transfer those half-baked changesets between repositories to try things out on your test server before anything is carved in stone. +

+ A less common scenario is multiple developers sharing mutable history, typically for code review. We’ll cover this scenario later. First, we will cover single-user sharing. +

+ + +

+ Getting into trouble with shared mutable history ¶ +

+ Mercurial with evolve is a powerful tool, and using powerful tools can have consequences. (You can cut yourself badly with a sharp knife, but every competent chef keeps several around. Ever try to chop onions with a spoon?) +

+ In the user guide, we saw examples of unstbale changesets, which are the most common type of troubled changeset. (Recall that a non-obsolete changeset with obsolete ancestors is an orphan.) +

+ Two other types of troubles can happen: divergent and bumped changesets. Both are more likely with shared mutable history, especially mutable history shared by multiple developers. +

+ Setting up ¶ +

+ For these examples, we’re going to use a slightly different workflow: as before, Alice and Bob share a public repository. But this time there is no review repository. Instead, Alice and Bob put on their cowboy hats, throw good practice to the wind, and pull directly from each other’s working repositories. +

+ So we throw away everything except public and reclone: +

+                            
+                                $ rm -rf review alice bob
+$ hg clone public alice
+updating to branch default
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ hg clone public bob
+updating to branch default
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+                            

+                        

+ Once again we have to configure their repositories: enable evolve and (since Alice and Bob will be pulling directly from each other) make their repositories non-publishing. Edit Alice’s configuration: +

+                            
+                                $ hg -R alice config --edit --local
+
+                            

+                        

+ and add +

+                            
+                                [extensions]
+rebase =
+evolve =
+
+[phases]
+publish = false
+
+                            

+                        

+ Then edit Bob’s repository configuration: +

+                            
+                                $ hg -R bob config --edit --local
+
+                            

+                        

+ and add the same text. +

+ Example 6: Divergent changesets ¶ +

+ When an obsolete changeset has two successors, those successors are divergent. One way to get into such a situation is by failing to communicate with your teammates. Let’s see how that might happen. +

+ First, we’ll have Bob commit a bug fix that could still be improved: +

+                            
+                                $ cd bob
+$ echo 'pretty good fix' >> file1
+$ hg commit -u bob -m 'fix bug 24 (v1)'                   # rev 4:2fe6
+
+                            

+                        

+ Since Alice and Bob are now in cowboy mode, Alice pulls Bob’s draft changeset and amends it herself. +

+                            
+                                $ cd ../alice
+$ hg pull -u ../bob
+[...]
+added 1 changesets with 1 changes to 1 files
+$ echo 'better fix (alice)' >> file1
+$ hg amend -u alice -m 'fix bug 24 (v2 by alice)'
+
+                            

+                        

+ But Bob has no idea that Alice just did this. (See how important good communication is?) So he implements a better fix of his own: +

+                            
+                                $ cd ../bob
+$ echo 'better fix (bob)' >> file1
+$ hg amend -u bob -m 'fix bug 24 (v2 by bob)'             # rev 6:a360
+
+                            

+                        

+ At this point, the divergence exists, but only in theory: Bob’s original changeset, 4:2fe6, is obsolete and has two successors. But those successors are in different repositories, so the trouble is not visible to anyone yet. It will be as soon as Bob pulls from Alice’s repository (or vice-versa). +

+                            
+                                $ hg pull ../alice
+[...]
+added 1 changesets with 1 changes to 2 files (+1 heads)
+(run 'hg heads' to see heads, 'hg merge' to merge)
+2 new divergent changesets
+
+                            

+                        

+ Figure 9 shows the situation in Bob’s repository. +

+
+ [figure SG09: Bob’s repo with 2 heads for the 2 divergent changesets, 6:a360 and 7:e3f9; wc is at 6:a360; both are successors of obsolete 4:2fe6, hence divergence] +
+

+ Now we need to get out of trouble. As usual, the answer is to evolve history. +

+                            
+                                $ HGMERGE=internal:other hg evolve
+merge:[6] fix bug 24 (v2 by bob)
+with: [7] fix bug 24 (v2 by alice)
+base: [4] fix bug 24 (v1)
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+
+                            

+                        

+ Figure 10 shows how Bob’s repository looks now. +

+
+ [figure SG10: only one visible head, 9:5ad6, successor to hidden 6:a360 and 7:e3f9] +
+

+ We carefully dodged a merge conflict by specifying a merge tool (internal:other) that will take Alice’s changes over Bob’s. (You might wonder why Bob wouldn’t prefer his own changes by using internal:local. He’s avoiding a bug in evolve that occurs when evolving divergent changesets using internal:local.) +

+ # XXX this link does not work .. bug: https://bitbucket.org/marmoute/mutable-history/issue/48/ +

+ ** STOP HERE: WORK IN PROGRESS ** +

+ Phase-divergence: when a rewritten changeset is made public ¶ +

+ If Alice and Bob are collaborating on some mutable changesets, it’s possible to get into a situation where an otherwise worthwhile changeset cannot be pushed to the public repository; it is phase-divergent with another changeset that was made public first. Let’s demonstrate one way this could happen. +

+ It starts with Alice committing a bug fix. Right now, we don’t yet know if this bug fix is good enough to push to the public repository, but it’s good enough for Alice to commit. +

+                            
+                                $ cd alice
+$ echo 'fix' > file2
+$ hg commit -A -m 'fix bug 15'
+adding file2
+
+                            

+                        

+ Now Bob has a bad idea: he decides to pull whatever Alice is working on and tweak her bug fix to his taste: +

+                            
+                                $ cd ../bob
+$ hg pull -u ../alice
+[...]
+added 1 changesets with 1 changes to 1 files
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+$ echo 'Fix.' > file2
+$ hg amend -A -m 'fix bug 15 (amended)'
+
+                            

+                        

+ (Note the lack of communication between Alice and Bob. Failing to communicate with your colleagues is a good way to get into trouble. Nevertheless, evolve can usually sort things out, as we will see.) +

+
+ [figure SG06: Bob’s repo with one amendment] +
+

+ After some testing, Alice realizes her bug fix is just fine as it is: no need for further polishing and amending, this changeset is ready to publish. +

+                            
+                                $ cd ../alice
+$ hg push
+[...]
+added 1 changesets with 1 changes to 1 files
+
+                            

+                        

+ This introduces a contradiction: in Bob’s repository, changeset 2:e011 (his copy of Alice’s fix) is obsolete, since Bob amended it. But in Alice’s repository (and the public repository), that changeset is public: it is immutable, carved in stone for all eternity. No changeset can be both obsolete and public, so Bob is in for a surprise the next time he pulls from public: +

+                            
+                                $ cd ../bob
+$ hg pull -q -u
+1 new phase-divergent changesets
+
+                            

+                        

+ Figure 7 shows what just happened to Bob’s repository: changeset 2:e011 is now public, so it can’t be obsolete. When that changeset was obsolete, it made perfect sense for it to have a successor, namely Bob’s amendment of Alice’s fix (changeset 4:fe88). But it’s illogical for a public changeset to have a successor, so 4:fe88 is troubled: it has become bumped. +

+
+ [figure SG07: 2:e011 now public not obsolete, 4:fe88 now bumped] +
+

+ As usual when there’s trouble in your repository, the solution is to evolve it: +

+                            
+                                $ hg evolve --all
+
+                            

+                        

+ Figure 8 illustrates Bob’s repository after evolving away the bumped changeset. Ignoring the obsolete changesets, Bob now has a nice, clean, simple history. His amendment of Alice’s bug fix lives on, as changeset 5:227d—albeit with a software-generated commit message. (Bob should probably amend that changeset to improve the commit message.) But the important thing is that his repository no longer has any troubled changesets, thanks to evolve. +

+
+ [figure SG08: 5:227d is new, formerly bumped changeset 4:fe88 now hidden] +
+

+ Conclusion ¶ +

+ Mutable history is a powerful tool. Like a sharp knife, an experienced user can do wonderful things with it, much more wonderful than with a dull knife (never mind a rusty spoon). At the same time, an inattentive or careless user can do harm to himself or others. Mercurial with evolve goes to great lengths to limit the harm you can do by trying to handle all possible types of “troubled” changesets. Nevertheless, having a first-aid kit nearby does not mean you should stop being careful with sharp knives. +

+ Mutable history shared across multiple repositories by a single developer is a natural extension of this model. Once you are used to using a single sharp knife on its own, it’s pretty straightforward to chop onions and mushrooms using the same knife, or to alternate between two chopping boards with different knives. +

+ Mutable history shared by multiple developers is a scary place to go. Imagine a professional kitchen full of expert chefs tossing their favourite knives back and forth, with the occasional axe or chainsaw thrown in to spice things up. If you’re confident that you and your colleagues can do it without losing a limb, go for it. But be sure to practice a lot first before you rely on it! +

+ +

+ + +

+ Tax cuts, spending increases and higher interest rates could make it harder to respond to future recessions and deal with other needs. +

Image +

+ Interest payments on the federal debt could surpass the Defense Department budget in 2023.CreditCreditJeon Heon-Kyun/EPA, via Shutterstock +

+ +

+ The federal government could soon pay more in interest on its debt than it spends on the military, Medicaid or children’s programs. +

+ The run-up in borrowing costs is a one-two punch brought on by the need to finance a fast-growing budget deficit, worsened by tax cuts and steadily rising interest rates that will make the debt more expensive. +

+ With less money coming in and more going toward interest, political leaders will find it harder to address pressing needs like fixing crumbling roads and bridges or to make emergency moves like pulling the economy out of future recessions. +

+ Within a decade, more than $900 billion in interest payments will be due annually, easily outpacing spending on myriad other programs. Already the fastest-growing major government expense, the cost of interest is on track to hit $390 billion next year, nearly 50 percent more than in 2017, according to the Congressional Budget Office. +

+ “It’s very much something to worry about,” said C. Eugene Steuerle, a fellow at the Urban Institute and a co-founder of the Urban-Brookings Tax Policy Center in Washington. “Everything else is getting squeezed.” +

+ Gradually rising interest rates would have made borrowing more expensive even without additional debt. But the tax cuts passed late last year have created a deeper hole, with the deficit increasing faster than expected. A budget bill approved in February that raised spending by $300 billion over two years will add to the financial pressure. +

+ The deficit is expected to total nearly $1 trillion next year — the first time it has been that big since 2012, when the economy was still struggling to recover from the financial crisis and interest rates were near zero. +

+ +

+ Deficit hawks have gone silent, even proposing changes that would exacerbate the deficit. House Republicans introduced legislation this month that would make the tax cuts permanent. +

+ “The issue has just disappeared,” said Senator Mark Warner, a Virginia Democrat. “There’s collective amnesia.” +

+ The combination, say economists, marks a journey into mostly uncharted financial territory. +

+ In the past, government borrowing expanded during recessions and waned in recoveries. That countercyclical policy has been a part of the standard Keynesian toolbox to combat downturns since the Great Depression. +

+ The deficit is soaring now as the economy booms, meaning the stimulus is pro-cyclical. The risk is that the government would have less room to maneuver if the economy slows. +

+ +

+ Aside from wartime or a deep downturn like the 1930s or 2008-9, “this sort of aggressive fiscal stimulus is unprecedented in U.S. history,” said Jeffrey Frankel, an economist at Harvard. +

+ Pouring gasoline on an already hot economy has resulted in faster growth — the economy expanded at an annualized rate of 4.2 percent in the second quarter. But Mr. Frankel warns that when the economy weakens, the government will find it more difficult to cut taxes or increase spending. +

+ Lawmakers might, in fact, feel compelled to cut spending as tax revenue falls, further depressing the economy. “There will eventually be another recession, and this increases the chances we will have to slam on the brakes when the car is already going too slowly,” Mr. Frankel said. +

+ Interest costs make it harder for the government to do other things +

+ +

+ Finding the money to pay investors who hold government debt will crimp other parts of the budget. In a decade, interest on the debt will eat up 13 percent of government spending, up from 6.6 percent in 2017. +

+ “By 2020, we will spend more on interest than we do on kids, including education, food stamps and aid to families,” said Marc Goldwein, senior policy director at the Committee for a Responsible Federal Budget, a research and advocacy organization. +

+ Interest costs already dwarf spending on many popular programs. For example, grants to students from low-income families for college total roughly $30 billion — about one-tenth of what the government will pay in interest this year. Interest payments will overtake Medicaid in 2020 and the Department of Defense budget in 2023. +

+ What’s more, the heavy burden of interest payments could make it harder for the government to repair aging infrastructure or take on other big new projects. +

+ Mr. Trump has called for spending $1 trillion on infrastructure, but Congress has not taken up that idea. +

+ More about the federal debt and the economy +

+ +

+ The U.S. hasn’t faced this issue for years +

+ Until recently, ultralow interest rates, set by the Federal Reserve to support the economy, allowed lawmakers to borrow without fretting too much about the cost of that debt. +

+ But as the economy has strengthened, the Fed has gradually raised rates, starting in December 2015. The central bank is expected to push rates up again on Wednesday, and more increases are in store. +

+ “When rates went down to record lows, it allowed the government to take on more debt without paying more interest,” Mr. Goldwein said. “That party is ending.” +

+ +

+ Since the beginning of the year, the yield on the 10-year Treasury note has risen by more than half a percentage point, to 3.1 percent. The Congressional Budget Office estimates that the yield will climb to 4.2 percent in 2021. Given that the total public debt of the United States stands at nearly $16 trillion, even a small uptick in rates can cost the government billions. +

+ +

+ There’s no guarantee that these forecasts will prove accurate. If the economy weakens, rates might fall or rise only slightly, reducing interest payments. But rates could also overshoot the budget office forecast. +

+ Some members of Congress want to set the stage for even more red ink. Republicans in the House want to make last year’s tax cuts permanent, instead of letting some of them expire at the end of 2025. That would reduce federal revenue by an additional $631 billion over 10 years, according to the Tax Policy Center. +

+ No, the United States isn’t at risk of becoming the next Greece +

+ +

+ Deficit hawks have warned for years that a day of reckoning is coming, exposing the United States to the kind of economic crisis that overtook profligate borrowers in the past like Greece or Argentina. +

+ But most experts say that isn’t likely because the dollar is the world’s reserve currency. As a result, the United States still has plenty of borrowing capacity left because the Fed can print money with fewer consequences than other central banks. +

+ And interest rates plunged over the last decade, even as the government turned to the market for trillions each year after the recession. That’s because Treasury bonds are still the favored port of international investors in any economic storm. +

+ “We exported a financial crisis a decade ago, and the world responded by sending us money,” said William G. Gale, a senior fellow at the Brookings Institution. +

+ But that privileged position has allowed politicians in both parties to avoid politically painful steps like cutting spending or raising taxes. +

+ That doesn’t mean rapidly rising interest costs and a bigger deficit won’t eventually catch up with us. +

+ Charles Schultze, chairman of the Council of Economic Advisers in the Carter administration, once summed up the danger of deficits with a metaphor. “It’s not so much a question of the wolf at the door, but termites in the woodwork.” +

+ But Washington doesn’t want to hear about the potential problems +

+ Rather than simply splitting along party lines, lawmakers’ attitudes toward the deficit also depend on which party is in power. Republicans pilloried the Obama administration for proposing a large stimulus in the depths of the recession in 2009 and complained about the deficit for years. +

+ In 2013, Senator Mitch McConnell of Kentucky called the debt and deficit “the transcendent issue of our era.” By 2017, as Senate majority leader, he quickly shepherded the tax cut through Congress. +

+ Senator James Lankford, an Oklahoma Republican who warned of the deficit’s dangers in the past, nevertheless played down that threat on the Senate floor as the tax billed neared passage. +

+ “I understand it’s a risk, but I think it’s an appropriate risk to be able to say let’s allow Americans to keep more of their own money to invest in this economy,” he said. +

+ He also claimed the tax cuts would pay for themselves even as the Congressional Budget Office estimated that they would add $250 billion to the deficit on average from 2019 to 2024. +

+ In an interview, Mr. Lankford insisted that the jury was still out on whether the tax cuts would generate additional revenue, citing the strong economic growth recently. +

+ While the Republican about-face has been much more striking, Democrats have adjusted their position, too. +

+ Mr. Warner, the Virginia Democrat, called last year’s tax bill “the worst piece of legislation we have passed since I arrived in the Senate.” In 2009, however, when Congress passed an $800 billion stimulus bill backed by the Obama administration, he called it “a responsible mix of tax cuts and investments that will create jobs.” +

+ The difference, Mr. Warner said, was that the economy was near the precipice then. +

+ “There was virtual unanimity among economists that we needed a stimulus,” he said. “But a $2 trillion tax cut at the end of a business cycle with borrowed money won’t end well.” +

+ +

+ Nelson D. Schwartz has covered economics since 2012. Previously, he wrote about Wall Street and banking, and also served as European economic correspondent in Paris. He joined The Times in 2007 as a feature writer for the Sunday Business section. @NelsonSchwartz +

+ A version of this article appears in print on

, on Page

of the New York edition

with the headline:

What May Soon Exceed Cost of U.S. Military? Interest on U.S. Debt . Order Reprints | Today’s Paper | Subscribe +

+ +

+ As Debt Rises, the Government Will Soon Spend More on Interest Than on the Military +

+ Tax cuts, spending increases and higher interest rates could make it harder to respond to future recessions and deal with other needs. +

+ Image

+ Interest payments on the federal debt could surpass the Defense Department budget in 2023.CreditCreditJeon Heon-Kyun/EPA, via Shutterstock +

+ +

+ By Nelson D. Schwartz +

+ Sept. 25, 2018 +
+
+
+
- + +
- + +
- + +
- +
  + +
  +
+
+
+

+ The federal government could soon pay more in interest on its debt than it spends on the military, Medicaid or children’s programs. +

+ +

+ Annual interest payments on the national debt are expected to triple over the next decade, according to the Congressional Budget Office. +

+ + + + +

+ +

+ $915 +

+ billion +

+ Interest payments on the national debt +

+ $900 +

+ billion +

+ 600 +

+ 300 +

+ $263 +

+ billion +

+ 0 +

+ ’17 +

+ ’18 +

+ ’19 +

+ ’20 +

+ ’21 +

+ ’22 +

+ ’23 +

+ ’24 +

+ ’25 +

+ ’26 +

+ ’27 +

+ ’28 +

+ Interest payments on the national debt +

+ $900 +

+ billion +

+ $915 +

+ billion +

+ 600 +

+ 300 +

+ $263 +

+ billion +

+ 0 +

+ ’17 +

+ ’18 +

+ ’19 +

+ ’20 +

+ ’21 +

+ ’22 +

+ ’23 +

+ ’24 +

+ ’25 +

+ ’26 +

+ ’27 +

+ ’28 +

+ + +

+ +

+ Deficit hawks have gone silent, even proposing changes that would exacerbate the deficit. House Republicans introduced legislation this month that would make the tax cuts permanent. +

+ “The issue has just disappeared,” said Senator Mark Warner, a Virginia Democrat. “There’s collective amnesia.” +

+ +

+ The combination, say economists, marks a journey into mostly uncharted financial territory. +

+ The deficit is soaring now as the economy booms, meaning the stimulus is pro-cyclical. The risk is that the government would have less room to maneuver if the economy slows. +

+ +

+ Aside from wartime or a deep downturn like the 1930s or 2008-9, “this sort of aggressive fiscal stimulus is unprecedented in U.S. history,” said Jeffrey Frankel, an economist at Harvard. +

+ Interest costs make it harder for the government to do other things +

+ +

+ What’s more, the heavy burden of interest payments could make it harder for the government to repair aging infrastructure or take on other big new projects. +

+ Mr. Trump has called for spending $1 trillion on infrastructure, but Congress has not taken up that idea. +

+ +

+ More about the federal debt and the economy +

+ +

+ Trump Administration Mulls a Unilateral Tax Cut for the Rich +

July 30, 2018 +

+ +

+ How the Trump Tax Cut Is Helping to Push the Federal Deficit to $1 Trillion +

July 25, 2018 +

+ The U.S. hasn’t faced this issue for years +

+ Until recently, ultralow interest rates, set by the Federal Reserve to support the economy, allowed lawmakers to borrow without fretting too much about the cost of that debt. +

+ “When rates went down to record lows, it allowed the government to take on more debt without paying more interest,” Mr. Goldwein said. “That party is ending.” +

+ +

+ After bottoming out below 2 percent, the yield on the 10-year Treasury note has climbed to over 3 percent recently. +

+ + + + +

+ +

+ Yield on 10-year Treasury note +

+ 8 +

+ % +

+ MONTHLY +

+ RECESSIONS +

+ 6 +

+ 4 +

+ 2 +

+ 0 +

+ ’98 +

+ ’00 +

+ ’02 +

+ ’04 +

+ ’06 +

+ ’08 +

+ ’10 +

+ ’12 +

+ ’14 +

+ ’16 +

+ ’18 +

+ Yield on 10-year Treasury note +

+ 8 +

+ % +

+ MONTHLY +

+ RECESSIONS +

+ 6 +

+ 4 +

+ 2 +

+ 0 +

+ ’98 +

+ ’02 +

+ ’06 +

+ ’10 +

+ ’14 +

+ ’18 +

+ + +

+ +

+ No, the United States isn’t at risk of becoming the next Greece +

+ +

+ The dollar has strengthened even as government borrowing has increased. +

+ + + + +

+ +

+ U.S. Dollar index +

+ 140 +

+ MONTHLY +

+ RECESSIONS +

+ 120 +

+ 100 +

+ 80 +

+ 60 +

+ ’98 +

+ ’00 +

+ ’02 +

+ ’04 +

+ ’06 +

+ ’08 +

+ ’10 +

+ ’12 +

+ ’14 +

+ ’16 +

+ ’18 +

+ U.S. Dollar index +

+ 140 +

+ MONTHLY +

+ RECESSIONS +

+ 120 +

+ 100 +

+ 80 +

+ 60 +

+ ’98 +

+ ’02 +

+ ’06 +

+ ’10 +

+ ’14 +

+ ’18 +

+ + +

+ +

+ “We exported a financial crisis a decade ago, and the world responded by sending us money,” said William G. Gale, a senior fellow at the Brookings Institution. +

+ But that privileged position has allowed politicians in both parties to avoid politically painful steps like cutting spending or raising taxes. +

+ +

+ That doesn’t mean rapidly rising interest costs and a bigger deficit won’t eventually catch up with us. +

+ But Washington doesn’t want to hear about the potential problems +

+ Senator James Lankford, an Oklahoma Republican who warned of the deficit’s dangers in the past, nevertheless played down that threat on the Senate floor as the tax billed neared passage. +

+ “I understand it’s a risk, but I think it’s an appropriate risk to be able to say let’s allow Americans to keep more of their own money to invest in this economy,” he said. +

+ He also claimed the tax cuts would pay for themselves even as the Congressional Budget Office estimated that they would add $250 billion to the deficit on average from 2019 to 2024. +

+ +

+ In an interview, Mr. Lankford insisted that the jury was still out on whether the tax cuts would generate additional revenue, citing the strong economic growth recently. +

+ While the Republican about-face has been much more striking, Democrats have adjusted their position, too. +

+ The difference, Mr. Warner said, was that the economy was near the precipice then. +

+ “There was virtual unanimity among economists that we needed a stimulus,” he said. “But a $2 trillion tax cut at the end of a business cycle with borrowed money won’t end well.” +

+ +

+ A version of this article appears in print on , on Page A1 of the New York edition with the headline: What May Soon Exceed Cost of U.S. Military? Interest on U.S. Debt . Order Reprints | Today’s Paper | Subscribe +

+ +

+ Advertisement +

+ Sharing with a single developer¶ +

+ Publishing and non-publishing repositories¶ +

+ Setting up¶ +

+ Example 2: Amend again, locally¶ +

+ Sharing with multiple developers: code review¶ +

+ Setting up¶ +

+ Example 3: Alice commits and amends a draft fix¶ +

+ Example 4: Bob implements and publishes a new feature¶ +

+ Example 5: Alice integrates and publishes¶ +

+ Getting into trouble with shared mutable history¶ +

+ Setting up¶ +

+ Example 6: Divergent changesets¶ +

+ Phase-divergence: when a rewritten changeset is made public¶ +

+ Conclusion¶ +

+ evolve extension for Mercurial +