Mercurial > evolve
comparison tests/test-evolve-templates.t @ 4359:2cbb9914d227 mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 22 Jan 2019 12:54:43 -0500 |
parents | f555039d1a08 8974a05a49fa |
children | 522abf1d70b7 7a779a288793 |
comparison
equal
deleted
inserted
replaced
4312:108b08a16260 | 4359:2cbb9914d227 |
---|---|
270 | 270 |
271 $ hg split -r 'desc(A0)' -d "0 0" << EOF | 271 $ hg split -r 'desc(A0)' -d "0 0" << EOF |
272 > y | 272 > y |
273 > y | 273 > y |
274 > n | 274 > n |
275 > n | 275 > y |
276 > y | 276 > y |
277 > y | 277 > y |
278 > EOF | 278 > EOF |
279 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 279 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
280 adding a | 280 adding a |
290 diff --git a/b b/b | 290 diff --git a/b b/b |
291 new file mode 100644 | 291 new file mode 100644 |
292 examine changes to 'b'? [Ynesfdaq?] n | 292 examine changes to 'b'? [Ynesfdaq?] n |
293 | 293 |
294 created new head | 294 created new head |
295 Done splitting? [yN] n | 295 continue splitting? [Ycdq?] y |
296 diff --git a/b b/b | 296 diff --git a/b b/b |
297 new file mode 100644 | 297 new file mode 100644 |
298 examine changes to 'b'? [Ynesfdaq?] y | 298 examine changes to 'b'? [Ynesfdaq?] y |
299 | 299 |
300 @@ -0,0 +1,1 @@ | 300 @@ -0,0 +1,1 @@ |