188 > y |
188 > y |
189 > n |
189 > n |
190 > EOF |
190 > EOF |
191 diff --git a/1.txt b/1.txt |
191 diff --git a/1.txt b/1.txt |
192 2 hunks, 2 lines changed |
192 2 hunks, 2 lines changed |
193 examine changes to '1.txt'? [Ynesfdaq?] y |
193 examine changes to '1.txt'? |
|
194 (enter ? for help) [Ynesfdaq?] y |
194 |
195 |
195 @@ -1,3 +1,3 @@ |
196 @@ -1,3 +1,3 @@ |
196 1 |
197 1 |
197 -2 |
198 -2 |
198 +2 2 |
199 +2 2 |
199 3 |
200 3 |
200 record change 1/4 to '1.txt'? [Ynesfdaq?] y |
201 record change 1/4 to '1.txt'? |
|
202 (enter ? for help) [Ynesfdaq?] y |
201 |
203 |
202 @@ -3,3 +3,3 @@ |
204 @@ -3,3 +3,3 @@ |
203 3 |
205 3 |
204 -4 |
206 -4 |
205 +4 4 |
207 +4 4 |
206 5 |
208 5 |
207 record change 2/4 to '1.txt'? [Ynesfdaq?] n |
209 record change 2/4 to '1.txt'? |
|
210 (enter ? for help) [Ynesfdaq?] n |
208 |
211 |
209 diff --git a/2.txt b/2.txt |
212 diff --git a/2.txt b/2.txt |
210 1 hunks, 1 lines changed |
213 1 hunks, 1 lines changed |
211 examine changes to '2.txt'? [Ynesfdaq?] y |
214 examine changes to '2.txt'? |
|
215 (enter ? for help) [Ynesfdaq?] y |
212 |
216 |
213 @@ -1,5 +1,5 @@ |
217 @@ -1,5 +1,5 @@ |
214 a |
218 a |
215 -b |
219 -b |
216 +b b |
220 +b b |
217 c |
221 c |
218 d |
222 d |
219 e |
223 e |
220 record change 3/4 to '2.txt'? [Ynesfdaq?] y |
224 record change 3/4 to '2.txt'? |
|
225 (enter ? for help) [Ynesfdaq?] y |
221 |
226 |
222 diff --git a/dir/a.txt b/dir/a.txt |
227 diff --git a/dir/a.txt b/dir/a.txt |
223 1 hunks, 1 lines changed |
228 1 hunks, 1 lines changed |
224 examine changes to 'dir/a.txt'? [Ynesfdaq?] n |
229 examine changes to 'dir/a.txt'? |
|
230 (enter ? for help) [Ynesfdaq?] n |
225 |
231 |
226 |
232 |
227 After partial qrefresh 'tip' |
233 After partial qrefresh 'tip' |
228 |
234 |
229 $ hg tip -p |
235 $ hg tip -p |
288 > y |
294 > y |
289 > y |
295 > y |
290 > EOF |
296 > EOF |
291 diff --git a/1.txt b/1.txt |
297 diff --git a/1.txt b/1.txt |
292 1 hunks, 1 lines changed |
298 1 hunks, 1 lines changed |
293 examine changes to '1.txt'? [Ynesfdaq?] y |
299 examine changes to '1.txt'? |
|
300 (enter ? for help) [Ynesfdaq?] y |
294 |
301 |
295 @@ -1,5 +1,5 @@ |
302 @@ -1,5 +1,5 @@ |
296 1 |
303 1 |
297 2 2 |
304 2 2 |
298 3 |
305 3 |
299 -4 |
306 -4 |
300 +4 4 |
307 +4 4 |
301 5 |
308 5 |
302 record change 1/2 to '1.txt'? [Ynesfdaq?] y |
309 record change 1/2 to '1.txt'? |
|
310 (enter ? for help) [Ynesfdaq?] y |
303 |
311 |
304 diff --git a/dir/a.txt b/dir/a.txt |
312 diff --git a/dir/a.txt b/dir/a.txt |
305 1 hunks, 1 lines changed |
313 1 hunks, 1 lines changed |
306 examine changes to 'dir/a.txt'? [Ynesfdaq?] y |
314 examine changes to 'dir/a.txt'? |
|
315 (enter ? for help) [Ynesfdaq?] y |
307 |
316 |
308 @@ -1,4 +1,4 @@ |
317 @@ -1,4 +1,4 @@ |
309 -hello world |
318 -hello world |
310 +hello world! |
319 +hello world! |
311 |
320 |
312 someone |
321 someone |
313 up |
322 up |
314 record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y |
323 record change 2/2 to 'dir/a.txt'? |
|
324 (enter ? for help) [Ynesfdaq?] y |
315 |
325 |
316 |
326 |
317 After final qrefresh 'tip' |
327 After final qrefresh 'tip' |
318 |
328 |
319 $ hg tip -p |
329 $ hg tip -p |