#15223: Let the `TestSuite` test that the construction of a parent returns the
parent
-------------------------------------+-------------------------------------
       Reporter:  SimonKing          |        Owner:
           Type:  defect             |       Status:  new
       Priority:  major              |    Milestone:  sage-5.12
      Component:  coercion           |   Resolution:
       Keywords:                     |    Merged in:
        Authors:                     |    Reviewers:
Report Upstream:  N/A                |  Work issues:
         Branch:                     |       Commit:
  u/SimonKing/ticket/15223           |  a81fcc1072df88cc369d7aa0b7ae423fd97d7f02
   Dependencies:                     |     Stopgaps:
-------------------------------------+-------------------------------------

Comment (by SimonKing):

 Replying to [comment:16 jkeitel]:
 > I am not sure how to just take a part of your last commit, but you can
 do the following:
 > While you're on your current development branch, write git branch
 new_branch to start a new branch pointing to the current commit.
 > Then go back to the old branch via git checkout old_branch and either
 delete manually the changes you don't want to to have on that branch or go
 back to a previous commit via
 > git reset --hard first_few_digits_of_sha_to_revert_to
 > You can then recommit some of the changes or just start working from
 there again.
 >
 > This probably doesn't do exactly what you want, but it might be a start.

 Thank you!

 I had already started before your answer came. That's to say, I have
 stored `git diff HEAD~ HEAD` into a file `tmp.patch`, then manually
 reverted the changes that I didn't like, did `git add <changed_files>` and
 `git commit --amend`. And now, I should be able to create a branch for a
 different ticket, and apply the relevant changes stored in `tmp.patch`.

 Since I didn't push the "wrong" commit to trac (in particular, clearly no
 other branch on trac will use my wrong commit), I guess it is ok to do
 `git commit --amend`, although it changes SHA1.

--
Ticket URL: <http://trac.sagemath.org/ticket/15223#comment:17>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica, 
and MATLAB

-- 
You received this message because you are subscribed to the Google Groups 
"sage-trac" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to