Mercurial > hg
comparison tests/test-histedit-fold.t @ 22165:3ddfb9b3fdc6
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 14 Aug 2014 15:21:48 -0500 |
parents | d2a5986cb89d 9ac98c2aa95c |
children | eb315418224c |
comparison
equal
deleted
inserted
replaced
22164:efd65e51bc0b | 22165:3ddfb9b3fdc6 |
---|---|
211 | 211 |
212 | 212 |
213 check saving last-message.txt | 213 check saving last-message.txt |
214 | 214 |
215 $ cd .. | 215 $ cd .. |
216 $ rm -r r | |
217 | |
218 folding preserves initial author | |
219 -------------------------------- | |
220 | |
221 $ initrepo | |
222 | |
223 $ hg ci --user "someone else" --amend --quiet | |
224 | |
225 tip before edit | |
226 $ hg log --rev . | |
227 changeset: 5:a00ad806cb55 | |
228 tag: tip | |
229 user: someone else | |
230 date: Thu Jan 01 00:00:00 1970 +0000 | |
231 summary: f | |
232 | |
233 | |
234 $ hg histedit e860deea161a --commands - 2>&1 <<EOF | fixbundle | |
235 > pick e860deea161a e | |
236 > fold a00ad806cb55 f | |
237 > EOF | |
238 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
239 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
240 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
241 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
242 | |
243 tip after edit | |
244 $ hg log --rev . | |
245 changeset: 4:698d4e8040a1 | |
246 tag: tip | |
247 user: test | |
248 date: Thu Jan 01 00:00:00 1970 +0000 | |
249 summary: e | |
250 | |
251 | |
252 $ cd .. | |
253 $ rm -r r | |
216 | 254 |
217 folding and creating no new change doesn't break: | 255 folding and creating no new change doesn't break: |
218 ------------------------------------------------- | 256 ------------------------------------------------- |
219 | 257 |
220 folded content is dropped during a merge. The folded commit should properly disappear. | 258 folded content is dropped during a merge. The folded commit should properly disappear. |