You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: test/test-pages/bug-1255978/expected.html
+26Lines changed: 26 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -14,6 +14,32 @@
14
14
<p>1. Take any blankets or duvets off the bed</p>
15
15
<p>Forrest Jones said that anything that comes into contact with any of the previous guest’s skin should be taken out and washed every time the room is made, but that even the fanciest hotels don’t always do so. "Hotels are getting away from comforters. Blankets are here to stay, however. But some hotels are still hesitant about washing them every day if they think they can get out of it," he said.</p>
Copy file name to clipboardExpand all lines: test/test-pages/citylab-1/expected.html
+4Lines changed: 4 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -20,6 +20,10 @@
20
20
</figure>
21
21
<div>
22
22
<h2itemprop="headline"> Why Neon Is the Ultimate Symbol of the 20th Century </h2>
23
+
<div>
24
+
<p><span><time>1:39 PM ET</time></span>
25
+
</p>
26
+
</div>
23
27
</div>
24
28
<h2itemprop="description"> The once-ubiquitous form of lighting was novel when it first emerged in the early 1900s, though it has since come to represent decline. </h2>
Copy file name to clipboardExpand all lines: test/test-pages/ehow-1/expected.html
+3-5Lines changed: 3 additions & 5 deletions
Original file line number
Diff line number
Diff line change
@@ -1,17 +1,15 @@
1
1
<divid="readability-page-1" class="page">
2
2
<div>
3
3
<header>
4
+
<div>
5
+
<p><span></span><span></span><span>Found This Helpful</span></p>
6
+
</div>
4
7
</header>
5
8
<div>
6
9
<p>Glass cloche terrariums are not only appealing to the eye, but they also preserve a bit of nature in your home and serve as a simple, yet beautiful, piece of art. Closed terrariums are easy to care for, as they retain much of their own moisture and provide a warm environment with a consistent level of humidity. You won’t have to water the terrariums unless you see that the walls are not misting up. Small growing plants that don’t require a lot of light work best such as succulents, ferns, moss, even orchids.</p>
Copy file name to clipboardExpand all lines: test/test-pages/mercurial/expected.html
+18Lines changed: 18 additions & 0 deletions
Original file line number
Diff line number
Diff line change
@@ -90,6 +90,10 @@ <h3>
90
90
<ahref="#id7">Setting up</a><ahref="#setting-up" title="Permalink to this headline">¶</a>
91
91
</h3>
92
92
<p> We’ll work through an example with three local repositories, although in the real world they’d most likely be on three different computers. First, the <tt><span>public</span></tt> repository is where tested, polished changesets live, and it is where you synchronize with the rest of your team. </p>
93
+
<div>
94
+
<pre>$ hg init public
95
+
</pre>
96
+
</div>
93
97
<p> We’ll need two clones where work gets done, <tt><span>test-repo</span></tt> and <tt><span>dev-repo</span></tt>: </p>
94
98
<div>
95
99
<pre>$ hg clone public test-repo
@@ -124,6 +128,11 @@ <h3>
124
128
</pre>
125
129
</div>
126
130
<p> and add </p>
131
+
<div>
132
+
<pre>[extensions]
133
+
evolve =
134
+
</pre>
135
+
</div>
127
136
<p> Keep in mind that in real life, these repositories would probably be on separate computers, so you’d have to login to each one to configure each repository. </p>
128
137
<p> To start things off, let’s make one public, immutable changeset: </p>
129
138
<div>
@@ -228,6 +237,11 @@ <h3>
228
237
</pre>
229
238
</div>
230
239
<p> and add </p>
240
+
<div>
241
+
<pre>[extensions]
242
+
evolve =
243
+
</pre>
244
+
</div>
231
245
<p> Then edit Bob’s repository configuration: </p>
232
246
<div>
233
247
<pre>$ hg -R bob config --edit --local
@@ -523,6 +537,10 @@ <h3>
523
537
<p> [figure SG07: 2:e011 now public not obsolete, 4:fe88 now bumped] </p>
524
538
</blockquote>
525
539
<p> As usual when there’s trouble in your repository, the solution is to evolve it: </p>
540
+
<div>
541
+
<pre>$ hg evolve --all
542
+
</pre>
543
+
</div>
526
544
<p> 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 <tt><span>evolve</span></tt>. </p>
527
545
<blockquote>
528
546
<p> [figure SG08: 5:227d is new, formerly bumped changeset 4:fe88 now hidden] </p>
0 commit comments