#13393: Vector normalization
--------------------------------------------+-------------------------------
       Reporter:  chrisjamesberg            |         Owner:  Chris Berg        
          
           Type:  defect                    |        Status:  needs_review      
          
       Priority:  major                     |     Milestone:  sage-5.6          
          
      Component:  linear algebra            |    Resolution:                    
          
       Keywords:  vector, normalize         |   Work issues:  doctest, 
docstring          
Report Upstream:  N/A                       |     Reviewers:  Luis Serrano, 
Benjamin Jones
        Authors:  Chris Berg, Eviatar Bach  |     Merged in:                    
          
   Dependencies:                            |      Stopgaps:                    
          
--------------------------------------------+-------------------------------

Comment (by ppurka):

 I think these are all small changes, and so you can merge them all into
 one file - the first patch. You can do the merge using
 
[http://mercurial.selenic.com/wiki/EditingHistory?highlight=%28qfold%29#Editing_recent_history_with_MQ
 mercurial itself]. You will need to do the following - for details see the
 wiki I linked to. I will assume that you have your three patches in your
 queue and are unapplied.
 {{{
 ...6.beta0/devel/sage [255] » hg qser  # <<< how it looks now
 trac13032_doc.patch                # <<< blue color, already applied
 trac_10508_doctest.patch           # <<< blue color, already applied
 trac_10508_update_atlas_docs.patch # <<< blue color, already applied
 new.patch                          # <<< grey color, unapplied patch
 trac_13393_normalized_2.patch      # <<< grey color, unapplied patch
 trac_13393_normalized.patch        # <<< grey color, unapplied patch

 ...sage-5.6.beta0/devel/sage» hg qpush --move trac_13393_normalized.patch
 applying trac_13393_normalized.patch
 now at: trac_13393_normalized.patch

 ...sage-5.6.beta0/devel/sage» hg qfold trac_13393_normalized_2.patch
 ...sage-5.6.beta0/devel/sage» hg qfold new.patch

 ...sage-5.6.beta0/devel/sage» hg export tip | head  # <<<< Notice the
 merged commit messages.
 # HG changeset patch
 # User Eviatar Bach <snip>
 # Date 1356146661 28800
 # Node ID 110394caabbfb0cc7dd9f81ce865f68bdb9c17b9
 # Parent  d6de0068244b5820661ab3bde2082862a53bf536
 Trac 13393: new 'normalized' method for vectors, deprecating 'normalize'
 * * *
 Trac 13393: proper deprecation
 * * *
 Trac 13393: Docstring and doctest for .normalize()

 ...sage-5.6.beta0/devel/sage» hg qser  # <<< How the queue looks after the
 merge
 trac13032_doc.patch
 trac_10508_doctest.patch
 trac_10508_update_atlas_docs.patch
 trac_13393_normalized.patch
 }}}
 Once you are done you can upload the merged patch, give the correct
 'apply' command to the patchbot, and modify the description of this ticket
 to let others know which patch to apply (otherwise one has to read through
 all of the comments to figure it out).

-- 
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/13393#comment:27>
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 post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/sage-trac?hl=en.

Reply via email to