[vistrails-dev] [GIT] VisTrails: Updates test code

git-noreply at vistrails.org git-noreply at vistrails.org
Fri Feb 13 10:12:36 EST 2015


The project "VisTrails":

The branch, new-api_/test has been updated
  discards  94981daa591649198fc1b58b5886433747b508e1 (commit)
  discards  3c082e7b0245c627d262e3082066222327db499d (commit)
  discards  aaa0a727122c67085212a8800666844f690c185a (commit)
       via  7d9eb18f0686c5ecfe0e2064c796f14c54d53098 (commit)
       via  a042ac6abf247559d9094416efb7de948431eba9 (commit)
       via  e7d10567a4cd3c18ad7c7e5f5477d64e7aa562e6 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (94981daa591649198fc1b58b5886433747b508e1)
            \
             N -- N -- N (7d9eb18f0686c5ecfe0e2064c796f14c54d53098)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.


- Log -----------------------------------------------------------------
commit 7d9eb18f0686c5ecfe0e2064c796f14c54d53098
Author: Remi Rampin <remirampin at gmail.com>
Date:   Fri Feb 13 10:05:24 2015 -0500

Updates test code

commit a042ac6abf247559d9094416efb7de948431eba9
Merge: 9ef0166 e7d1056
Author: Remi Rampin <remirampin at gmail.com>
Date:   Fri Feb 13 10:07:02 2015 -0500

Merge branch 'new-api' into 'new-api_/test'

commit e7d10567a4cd3c18ad7c7e5f5477d64e7aa562e6
Author: Remi Rampin <remirampin at gmail.com>
Date:   Fri Feb 13 10:04:41 2015 -0500

Adds IPython rich display for image files

-----------------------------------------------------------------------

Summary of changes:
 vistrails/core/modules/basic_modules.py |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

-- 
VisTrails
git clone git at vgc.poly.edu:vistrails


More information about the vistrails-dev mailing list