| Submitter | timeless@mozdev.org |
|---|---|
| Date | Feb. 5, 2016, 2:09 a.m. |
| Message ID | <f523a6414cecdce46685.1454638184@waste.org> |
| Download | mbox | patch |
| Permalink | /patch/12996/ |
| State | Accepted |
| Headers | show |
Comments
On Thu, Feb 04, 2016 at 08:09:44PM -0600, timeless wrote: > # HG changeset patch > # User timeless <timeless@mozdev.org> > # Date 1454628649 0 > # Thu Feb 04 23:30:49 2016 +0000 > # Node ID f523a6414cecdce46685f7d3e67db942869d8803 > # Parent 3d51044735f6858f85f0d32df9c03642cdbc7e55 > tests: fix rebase-abort directory nesting Queued these 3, thanks. > > Without this change, some test repositories were nesting needlessly > > diff --git a/tests/test-rebase-abort.t b/tests/test-rebase-abort.t > --- a/tests/test-rebase-abort.t > +++ b/tests/test-rebase-abort.t > @@ -356,6 +356,7 @@ > commit: (clean) > update: 1 new changesets, 2 branch heads (merge) > phases: 4 draft > + $ cd .. > > test aborting a rebase succeeds after rebasing with skipped commits onto a > public changeset (issue4896) > @@ -389,4 +390,5 @@ > [1] > $ hg rebase --abort > rebase aborted > + $ cd .. > > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Patch
diff --git a/tests/test-rebase-abort.t b/tests/test-rebase-abort.t --- a/tests/test-rebase-abort.t +++ b/tests/test-rebase-abort.t @@ -356,6 +356,7 @@ commit: (clean) update: 1 new changesets, 2 branch heads (merge) phases: 4 draft + $ cd .. test aborting a rebase succeeds after rebasing with skipped commits onto a public changeset (issue4896) @@ -389,4 +390,5 @@ [1] $ hg rebase --abort rebase aborted + $ cd ..