Mercurial > evolve
comparison tests/test-evolve-obshistory-split.t @ 4360:522abf1d70b7 mercurial-4.6
test-compat: merge mercurial-4.7 into mercurial-4.6
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 22 Jan 2019 12:54:44 -0500 |
parents | f7afd3a158e3 8974a05a49fa |
children | 8bd60e09dfb4 d70db7e455dc |
comparison
equal
deleted
inserted
replaced
4313:4a740f9eee49 | 4360:522abf1d70b7 |
---|---|
36 | 36 |
37 $ hg split -r 'desc(A0)' -n "testing split" -d "0 0" << EOF | 37 $ hg split -r 'desc(A0)' -n "testing split" -d "0 0" << EOF |
38 > y | 38 > y |
39 > y | 39 > y |
40 > n | 40 > n |
41 > n | 41 > y |
42 > y | 42 > y |
43 > y | 43 > y |
44 > EOF | 44 > EOF |
45 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 45 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
46 adding a | 46 adding a |
56 diff --git a/b b/b | 56 diff --git a/b b/b |
57 new file mode 100644 | 57 new file mode 100644 |
58 examine changes to 'b'? [Ynesfdaq?] n | 58 examine changes to 'b'? [Ynesfdaq?] n |
59 | 59 |
60 created new head | 60 created new head |
61 Done splitting? [yN] n | 61 continue splitting? [Ycdq?] y |
62 diff --git a/b b/b | 62 diff --git a/b b/b |
63 new file mode 100644 | 63 new file mode 100644 |
64 examine changes to 'b'? [Ynesfdaq?] y | 64 examine changes to 'b'? [Ynesfdaq?] y |
65 | 65 |
66 @@ -0,0 +1,1 @@ | 66 @@ -0,0 +1,1 @@ |