Mercurial > evolve

comparison tests/test-evolve-obshistory-lots-of-splits.t @ 4293:d4902d48d095

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
split: add a option to discard remaining change during split This is useful to drop unwanted remaining change spotted during the split.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 20 Feb 2018 09:35:16 +0100
parents caaa89adf3eb
children 8974a05a49fa
comparison
equal deleted inserted replaced
4292:caaa89adf3eb 4293:d4902d48d095
80 diff --git a/d b/d 80 diff --git a/d b/d
81 new file mode 100644 81 new file mode 100644
82 examine changes to 'd'? [Ynesfdaq?] n 82 examine changes to 'd'? [Ynesfdaq?] n
83 83
84 created new head 84 created new head
85 Done splitting? [yNq?] n 85 Done splitting? [yNdq?] n
86 diff --git a/b b/b 86 diff --git a/b b/b
87 new file mode 100644 87 new file mode 100644
88 examine changes to 'b'? [Ynesfdaq?] y 88 examine changes to 'b'? [Ynesfdaq?] y
89 89
90 @@ -0,0 +1,1 @@ 90 @@ -0,0 +1,1 @@
97 97
98 diff --git a/d b/d 98 diff --git a/d b/d
99 new file mode 100644 99 new file mode 100644
100 examine changes to 'd'? [Ynesfdaq?] n 100 examine changes to 'd'? [Ynesfdaq?] n
101 101
102 Done splitting? [yNq?] n 102 Done splitting? [yNdq?] n
103 diff --git a/c b/c 103 diff --git a/c b/c
104 new file mode 100644 104 new file mode 100644
105 examine changes to 'c'? [Ynesfdaq?] y 105 examine changes to 'c'? [Ynesfdaq?] y
106 106
107 @@ -0,0 +1,1 @@ 107 @@ -0,0 +1,1 @@
110 110
111 diff --git a/d b/d 111 diff --git a/d b/d
112 new file mode 100644 112 new file mode 100644
113 examine changes to 'd'? [Ynesfdaq?] n 113 examine changes to 'd'? [Ynesfdaq?] n
114 114
115 Done splitting? [yNq?] n 115 Done splitting? [yNdq?] n
116 diff --git a/d b/d 116 diff --git a/d b/d
117 new file mode 100644 117 new file mode 100644
118 examine changes to 'd'? [Ynesfdaq?] y 118 examine changes to 'd'? [Ynesfdaq?] y
119 119
120 @@ -0,0 +1,1 @@ 120 @@ -0,0 +1,1 @@