Mercurial > evolve

comparison tests/test-stabilize-conflict.t @ 3013:945a0989e41b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
packaging: merge stable back into default 6.7.0 has been released.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 27 Sep 2017 16:26:30 +0200
parents bd7e8be29542
children e91ca8b5ecf7
comparison
equal deleted inserted replaced
3012:081070828703 3013:945a0989e41b
63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
64 [1] babar count up to ten 64 [1] babar count up to ten
65 $ safesed 's/huit/eight/' babar 65 $ safesed 's/huit/eight/' babar
66 $ hg diff 66 $ hg diff
67 diff -r 9d5daf8bd956 babar 67 diff -r 9d5daf8bd956 babar
68 --- a/babar Thu Jan 01 00:00:00 1970 +0000 68 --- a/babar * (glob)
69 +++ b/babar * (glob) 69 +++ b/babar * (glob)
70 @@ -5,6 +5,6 @@ 70 @@ -5,6 +5,6 @@
71 cinq 71 cinq
72 six 72 six
73 sept 73 sept
74 -huit 74 -huit
75 +eight 75 +eight
76 neuf 76 neuf
77 dix 77 dix
78 $ hg amend 78 $ hg amend
79 1 new unstable changesets 79 1 new orphan changesets
80 $ hg evolve 80 $ hg evolve
81 move:[2] babar count up to fifteen 81 move:[2] babar count up to fifteen
82 atop:[4] babar count up to ten 82 atop:[3] babar count up to ten
83 merging babar 83 merging babar
84 working directory is now at 71c18f70c34f 84 working directory is now at 71c18f70c34f
85 $ hg resolve -l 85 $ hg resolve -l
86 $ hg log -G 86 $ hg log -G
87 @ changeset: 5:71c18f70c34f 87 @ changeset: 4:71c18f70c34f
88 | tag: tip 88 | tag: tip
89 | user: test 89 | user: test
90 | date: Thu Jan 01 00:00:00 1970 +0000 90 | date: Thu Jan 01 00:00:00 1970 +0000
91 | summary: babar count up to fifteen 91 | summary: babar count up to fifteen
92 | 92 |
93 o changeset: 4:5977072d13c5 93 o changeset: 3:5977072d13c5
94 | parent: 0:29ec1554cfaf 94 | parent: 0:29ec1554cfaf
95 | user: test 95 | user: test
96 | date: Thu Jan 01 00:00:00 1970 +0000 96 | date: Thu Jan 01 00:00:00 1970 +0000
97 | summary: babar count up to ten 97 | summary: babar count up to ten
98 | 98 |
107 -------------------------------------------------- 107 --------------------------------------------------
108 108
109 $ hg gdown 109 $ hg gdown
110 gdown have been deprecated in favor of previous 110 gdown have been deprecated in favor of previous
111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 111 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
112 [4] babar count up to ten 112 [3] babar count up to ten
113 $ safesed 's/dix/ten/' babar 113 $ safesed 's/dix/ten/' babar
114 $ hg diff 114 $ hg diff
115 diff -r 5977072d13c5 babar 115 diff -r 5977072d13c5 babar
116 --- a/babar Thu Jan 01 00:00:00 1970 +0000 116 --- a/babar Thu Jan 01 00:00:00 1970 +0000
117 +++ b/babar * (glob) 117 +++ b/babar Thu Jan 01 00:00:00 1970 +0000
118 @@ -7,4 +7,4 @@ 118 @@ -7,4 +7,4 @@
119 sept 119 sept
120 eight 120 eight
121 neuf 121 neuf
122 -dix 122 -dix
123 +ten 123 +ten
124 $ hg amend 124 $ hg amend
125 1 new unstable changesets 125 1 new orphan changesets
126 $ hg evolve 126 $ hg evolve
127 move:[5] babar count up to fifteen 127 move:[4] babar count up to fifteen
128 atop:[7] babar count up to ten 128 atop:[5] babar count up to ten
129 merging babar 129 merging babar
130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') 130 warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
131 evolve failed! 131 evolve failed!
132 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort 132 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort
133 abort: unresolved merge conflicts (see hg help resolve) 133 abort: unresolved merge conflicts (see hg help resolve)
134 [255] 134 [255]
135 $ hg resolve -l 135 $ hg resolve -l
136 U babar 136 U babar
137 $ hg log -G 137 $ hg log -G
138 @ changeset: 7:e04690b09bc6 138 @ changeset: 5:e04690b09bc6
139 | tag: tip 139 | tag: tip
140 | parent: 0:29ec1554cfaf 140 | parent: 0:29ec1554cfaf
141 | user: test 141 | user: test
142 | date: Thu Jan 01 00:00:00 1970 +0000 142 | date: Thu Jan 01 00:00:00 1970 +0000
143 | summary: babar count up to ten 143 | summary: babar count up to ten
144 | 144 |
145 | o changeset: 5:71c18f70c34f 145 | o changeset: 4:71c18f70c34f
146 | | user: test 146 | | user: test
147 | | date: Thu Jan 01 00:00:00 1970 +0000 147 | | date: Thu Jan 01 00:00:00 1970 +0000
148 | | trouble: unstable 148 | | instability: orphan
149 | | summary: babar count up to fifteen 149 | | summary: babar count up to fifteen
150 | | 150 | |
151 | x changeset: 4:5977072d13c5 151 | x changeset: 3:5977072d13c5
152 |/ parent: 0:29ec1554cfaf 152 |/ parent: 0:29ec1554cfaf
153 | user: test 153 | user: test
154 | date: Thu Jan 01 00:00:00 1970 +0000 154 | date: Thu Jan 01 00:00:00 1970 +0000
155 | obsolete: amended as e04690b09bc6 155 | obsolete: amended as e04690b09bc6
156 | summary: babar count up to ten 156 | summary: babar count up to ten
166 reverting babar 166 reverting babar
167 $ safesed 's/dix/ten/' babar 167 $ safesed 's/dix/ten/' babar
168 $ hg resolve --all -m 168 $ hg resolve --all -m
169 (no more unresolved files) 169 (no more unresolved files)
170 $ hg evolve --continue 170 $ hg evolve --continue
171 grafting 5:71c18f70c34f "babar count up to fifteen" 171 grafting 4:71c18f70c34f "babar count up to fifteen"
172 $ hg resolve -l 172 $ hg resolve -l
173 $ hg log -G 173 $ hg log -G
174 @ changeset: 8:1836b91c6c1d 174 @ changeset: 6:1836b91c6c1d
175 | tag: tip 175 | tag: tip
176 | user: test 176 | user: test
177 | date: Thu Jan 01 00:00:00 1970 +0000 177 | date: Thu Jan 01 00:00:00 1970 +0000
178 | summary: babar count up to fifteen 178 | summary: babar count up to fifteen
179 | 179 |
180 o changeset: 7:e04690b09bc6 180 o changeset: 5:e04690b09bc6
181 | parent: 0:29ec1554cfaf 181 | parent: 0:29ec1554cfaf
182 | user: test 182 | user: test
183 | date: Thu Jan 01 00:00:00 1970 +0000 183 | date: Thu Jan 01 00:00:00 1970 +0000
184 | summary: babar count up to ten 184 | summary: babar count up to ten
185 | 185 |
194 $ safesed 's/merge=.*/merge=touch/' $HGRCPATH 194 $ safesed 's/merge=.*/merge=touch/' $HGRCPATH
195 $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH 195 $ safesed 's/touch.gui=.*/touch.gui=false/' $HGRCPATH
196 $ hg gdown 196 $ hg gdown
197 gdown have been deprecated in favor of previous 197 gdown have been deprecated in favor of previous
198 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 198 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
199 [7] babar count up to ten 199 [5] babar count up to ten
200 $ safesed 's/ten/zehn/' babar 200 $ safesed 's/ten/zehn/' babar
201 $ hg diff 201 $ hg diff
202 diff -r e04690b09bc6 babar 202 diff -r e04690b09bc6 babar
203 --- a/babar Thu Jan 01 00:00:00 1970 +0000 203 --- a/babar Thu Jan 01 00:00:00 1970 +0000
204 +++ b/babar * (glob) 204 +++ b/babar Thu Jan 01 00:00:00 1970 +0000
205 @@ -7,4 +7,4 @@ 205 @@ -7,4 +7,4 @@
206 sept 206 sept
207 eight 207 eight
208 neuf 208 neuf
209 -ten 209 -ten
210 +zehn 210 +zehn
211 $ hg amend 211 $ hg amend
212 1 new unstable changesets 212 1 new orphan changesets
213 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH 213 $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH
214 $ hg evolve --tool touch <<EOF 214 $ hg evolve --tool touch <<EOF
215 > n 215 > n
216 > EOF 216 > EOF
217 move:[8] babar count up to fifteen 217 move:[6] babar count up to fifteen
218 atop:[10] babar count up to ten 218 atop:[7] babar count up to ten
219 merging babar 219 merging babar
220 output file babar appears unchanged 220 output file babar appears unchanged
221 was merge successful (yn)? n 221 was merge successful (yn)? n
222 merging babar failed! 222 merging babar failed!
223 evolve failed! 223 evolve failed!
225 abort: unresolved merge conflicts (see hg help resolve) 225 abort: unresolved merge conflicts (see hg help resolve)
226 [255] 226 [255]
227 $ hg resolve -l 227 $ hg resolve -l
228 U babar 228 U babar
229 $ hg log -G 229 $ hg log -G
230 @ changeset: 10:b20d08eea373 230 @ changeset: 7:b20d08eea373
231 | tag: tip 231 | tag: tip
232 | parent: 0:29ec1554cfaf 232 | parent: 0:29ec1554cfaf
233 | user: test 233 | user: test
234 | date: Thu Jan 01 00:00:00 1970 +0000 234 | date: Thu Jan 01 00:00:00 1970 +0000
235 | summary: babar count up to ten 235 | summary: babar count up to ten
236 | 236 |
237 | o changeset: 8:1836b91c6c1d 237 | o changeset: 6:1836b91c6c1d
238 | | user: test 238 | | user: test
239 | | date: Thu Jan 01 00:00:00 1970 +0000 239 | | date: Thu Jan 01 00:00:00 1970 +0000
240 | | trouble: unstable 240 | | instability: orphan
241 | | summary: babar count up to fifteen 241 | | summary: babar count up to fifteen
242 | | 242 | |
243 | x changeset: 7:e04690b09bc6 243 | x changeset: 5:e04690b09bc6
244 |/ parent: 0:29ec1554cfaf 244 |/ parent: 0:29ec1554cfaf
245 | user: test 245 | user: test
246 | date: Thu Jan 01 00:00:00 1970 +0000 246 | date: Thu Jan 01 00:00:00 1970 +0000
247 | obsolete: amended as b20d08eea373 247 | obsolete: amended as b20d08eea373
248 | summary: babar count up to ten 248 | summary: babar count up to ten