Mercurial > hg
comparison tests/test-histedit-obsolete.t @ 28004:34165875fa5d
histedit: limit updated and merging output to important updates
Output is retained when:
* There's a conflict
* User asked to edit
* User aborts
otherwise, output is suppressed
author | timeless <timeless@mozdev.org> |
---|---|
date | Wed, 03 Feb 2016 13:52:04 +0000 |
parents | b698abf971e7 |
children | eed7d8c07c20 |
comparison
equal
deleted
inserted
replaced
28003:a1d4ca0c8483 | 28004:34165875fa5d |
---|---|
106 $ hg histedit 6 --commands - << EOF | 106 $ hg histedit 6 --commands - << EOF |
107 > pick b346ab9a313d 6 c | 107 > pick b346ab9a313d 6 c |
108 > drop 59d9f330561f 7 d | 108 > drop 59d9f330561f 7 d |
109 > pick cacdfd884a93 8 f | 109 > pick cacdfd884a93 8 f |
110 > EOF | 110 > EOF |
111 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
112 $ hg log --graph | 111 $ hg log --graph |
113 @ 11:c13eb81022ca f | 112 @ 11:c13eb81022ca f |
114 | | 113 | |
115 o 6:b346ab9a313d c | 114 o 6:b346ab9a313d c |
116 | | 115 | |
165 $ cd droplast | 164 $ cd droplast |
166 $ hg histedit -r '40db8afa467b' --commands - << EOF | 165 $ hg histedit -r '40db8afa467b' --commands - << EOF |
167 > pick 40db8afa467b 10 c | 166 > pick 40db8afa467b 10 c |
168 > drop b449568bf7fc 11 f | 167 > drop b449568bf7fc 11 f |
169 > EOF | 168 > EOF |
170 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
171 $ hg log -G | 169 $ hg log -G |
172 @ 12:40db8afa467b c | 170 @ 12:40db8afa467b c |
173 | | 171 | |
174 o 0:cb9a9f314b8b a | 172 o 0:cb9a9f314b8b a |
175 | 173 |
185 $ hg histedit -r '40db8afa467b' --commands - << EOF | 183 $ hg histedit -r '40db8afa467b' --commands - << EOF |
186 > pick 47a8561c0449 12 g | 184 > pick 47a8561c0449 12 g |
187 > pick 40db8afa467b 10 c | 185 > pick 40db8afa467b 10 c |
188 > drop 1b3b05f35ff0 13 h | 186 > drop 1b3b05f35ff0 13 h |
189 > EOF | 187 > EOF |
190 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
191 $ hg log -G | 188 $ hg log -G |
192 @ 17:ee6544123ab8 c | 189 @ 17:ee6544123ab8 c |
193 | | 190 | |
194 o 16:269e713e9eae g | 191 o 16:269e713e9eae g |
195 | | 192 | |
355 > pick 6b70183d2492 12 g | 352 > pick 6b70183d2492 12 g |
356 > pick b605fb7503f2 14 i | 353 > pick b605fb7503f2 14 i |
357 > pick 7395e1ff83bd 13 h | 354 > pick 7395e1ff83bd 13 h |
358 > pick ee118ab9fa44 16 k | 355 > pick ee118ab9fa44 16 k |
359 > EOF | 356 > EOF |
360 0 files updated, 0 files merged, 5 files removed, 0 files unresolved | |
361 $ hg log -G | 357 $ hg log -G |
362 @ 23:558246857888 (secret) k | 358 @ 23:558246857888 (secret) k |
363 | | 359 | |
364 o 22:28bd44768535 (secret) h | 360 o 22:28bd44768535 (secret) h |
365 | | 361 | |
397 > pick 6b70183d2492 12 g | 393 > pick 6b70183d2492 12 g |
398 > fold 3a6c53ee7f3d 15 j | 394 > fold 3a6c53ee7f3d 15 j |
399 > pick b605fb7503f2 14 i | 395 > pick b605fb7503f2 14 i |
400 > fold ee118ab9fa44 16 k | 396 > fold ee118ab9fa44 16 k |
401 > EOF | 397 > EOF |
402 0 files updated, 0 files merged, 6 files removed, 0 files unresolved | |
403 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
404 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
405 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
406 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
407 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
408 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
409 $ hg log -G | 398 $ hg log -G |
410 @ 27:f9daec13fb98 (secret) i | 399 @ 27:f9daec13fb98 (secret) i |
411 | | 400 | |
412 o 24:49807617f46a (secret) g | 401 o 24:49807617f46a (secret) g |
413 | | 402 | |