| Submitter | Bryan O'Sullivan |
|---|---|
| Date | May 14, 2013, 6:24 p.m. |
| Message ID | <24450ae0028e41faea54.1368555869@australite.thefacebook.com> |
| Download | mbox | patch |
| Permalink | /patch/1639/ |
| State | Accepted |
| Commit | f324a9b8d4bf04f6c2945110974b35d1627555ec |
| Headers | show |
Comments
On 05/14/2013 11:24 AM, Bryan O'Sullivan wrote: > # HG changeset patch > # User Bryan O'Sullivan <bryano@fb.com> > # Date 1368555797 25200 > # Tue May 14 11:23:17 2013 -0700 > # Node ID 24450ae0028e41faea548c0b12a425709e7e0cc3 > # Parent 199ddb0df8d7dc9d3a180b9bb5474aecf68213b4 > summary: add tests for some extensions we plan to modify > > diff --git a/tests/test-bisect.t b/tests/test-bisect.t > --- a/tests/test-bisect.t > +++ b/tests/test-bisect.t > @@ -184,6 +184,12 @@ bisect test > > $ hg bisect -r > $ hg bisect -b > + $ hg summary > + parent: 31:58c80a7c8a40 tip > + msg 31 > + branch: default > + commit: (clean) > + update: (current) I don't see any bisect patches in the series. Did you mean to have one?
On Tue, May 14, 2013 at 11:32 AM, Siddharth Agarwal <sid0@fb.com> wrote: > I don't see any bisect patches in the series. Did you mean to have one? > > I haven't written that patch yet. But yes, I'll get around to it at some point.
Patch
diff --git a/tests/test-bisect.t b/tests/test-bisect.t --- a/tests/test-bisect.t +++ b/tests/test-bisect.t @@ -184,6 +184,12 @@ bisect test $ 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 diff --git a/tests/test-histedit-edit.t b/tests/test-histedit-edit.t --- a/tests/test-histedit-edit.t +++ b/tests/test-histedit-edit.t @@ -152,6 +152,14 @@ check histedit_source 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) diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t --- a/tests/test-rebase-parameters.t +++ b/tests/test-rebase-parameters.t @@ -419,6 +419,15 @@ Test --tool parameter: 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