Mercurial > hg
comparison tests/test-obsolete.t @ 27722:edd2615ad226
summary: print unstable, bumped and divergent as unconditionally plural
This aligns with the unconditional plural output for the update line contents,
as well as the incoming/outgoing bookmarks line. It also matches the message
in evolve's summary hook as of 4f83b2d2d20d. (Though I thought this was removed
recently?)
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 11 Jan 2016 21:00:29 -0500 |
parents | 20e7de6205e7 |
children | 97e0dc6d248c |
comparison
equal
deleted
inserted
replaced
27721:e4b512bb6386 | 27722:edd2615ad226 |
---|---|
243 add new_3_c | 243 add new_3_c |
244 branch: default | 244 branch: default |
245 commit: (clean) | 245 commit: (clean) |
246 update: 1 new changesets, 2 branch heads (merge) | 246 update: 1 new changesets, 2 branch heads (merge) |
247 phases: 1 draft | 247 phases: 1 draft |
248 bumped: 1 changeset | 248 bumped: 1 changesets |
249 $ hg up '5^' | 249 $ hg up '5^' |
250 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 250 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
251 $ hg revert -ar 5 | 251 $ hg revert -ar 5 |
252 adding new_3_c | 252 adding new_3_c |
253 $ hg ci -m 'add n3w_3_c' | 253 $ hg ci -m 'add n3w_3_c' |
478 add original_e | 478 add original_e |
479 branch: default | 479 branch: default |
480 commit: (clean) | 480 commit: (clean) |
481 update: 1 new changesets, 2 branch heads (merge) | 481 update: 1 new changesets, 2 branch heads (merge) |
482 phases: 3 draft | 482 phases: 3 draft |
483 unstable: 1 changeset | 483 unstable: 1 changesets |
484 $ hg log -G -r '::unstable()' | 484 $ hg log -G -r '::unstable()' |
485 @ 5:cda648ca50f5 (draft) [tip ] add original_e | 485 @ 5:cda648ca50f5 (draft) [tip ] add original_e |
486 | | 486 | |
487 x 4:94b33453f93b (draft) [ ] add original_d | 487 x 4:94b33453f93b (draft) [ ] add original_d |
488 | | 488 | |