Mercurial > hg-stable
changeset 19213:f324a9b8d4bf
summary: add tests for some extensions we plan to modify
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Tue, 14 May 2013 11:23:17 -0700 |
parents | d0ba7022c13b |
children | 0250047a365e |
files | tests/test-bisect.t tests/test-histedit-edit.t tests/test-rebase-parameters.t |
diffstat | 3 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-bisect.t Tue May 14 11:23:16 2013 -0700 +++ b/tests/test-bisect.t Tue May 14 11:23:17 2013 -0700 @@ -184,6 +184,12 @@ $ hg bisect -r $ hg bisect -b + $ hg summary + parent: 31:58c80a7c8a40 tip + msg 31 + branch: default + commit: (clean) + update: (current) $ hg bisect -g 1 Testing changeset 16:a2e6ea4973e9 (30 changesets remaining, ~4 tests) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-histedit-edit.t Tue May 14 11:23:16 2013 -0700 +++ b/tests/test-histedit-edit.t Tue May 14 11:23:17 2013 -0700 @@ -152,6 +152,14 @@ When you are finished, run hg histedit --continue to resume. $ hg status A f + + $ hg summary + parent: 5:a5e1ba2f7afb + foobaz + branch: default + commit: 1 added (new branch head) + update: 1 new changesets (update) + $ HGEDITOR='true' hg histedit --continue 0 files updated, 0 files merged, 0 files removed, 0 files unresolved saved backup bundle to $TESTTMP/r/.hg/strip-backup/b5f70786f9b0-backup.hg (glob)
--- a/tests/test-rebase-parameters.t Tue May 14 11:23:16 2013 -0700 +++ b/tests/test-rebase-parameters.t Tue May 14 11:23:17 2013 -0700 @@ -419,6 +419,15 @@ unresolved conflicts (see hg resolve, then hg rebase --continue) [1] + $ hg summary + parent: 1:56daeba07f4b + c2 + parent: 2:e4e3f3546619 tip + c2b + branch: default + commit: 1 modified, 1 unresolved (merge) + update: (current) + $ hg resolve -l U c2