Changes between Version 37 and Version 38 of StartModMaint


Ignore:
Timestamp:
Dec 22, 2013, 2:46:16 PM (9 years ago)
Author:
Beman Dawes
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • StartModMaint

    v37 v38  
    3838Tests run on git version 1.8.4.msysgit.0
    3939
    40 || '''Branch''' || '''Contents''' || '''Super Origin''' || '''Result''' ||
    41 || Detached || Unmodified || Up-to-date || Detached, up-to-date ||
    42 || Detached || Unmodified || Behind || Detached, up-to-date ||
    43 || Detached || Uncommitted change || Up-to-date ||  ||
    44 || Detached || Uncommitted change || Behind ||  ||
     40|| '''Branch''' || '''Contents''' || '''Super Origin''' || '''Changes''' ||
     41|| Detached || Unmodified || Up-to-date || None ||
     42|| Detached || Unmodified || Behind || Updated ||
     43|| Detached || Uncommitted change || Up-to-date || error: Your local changes to the following files would be overwritten by checkout:
     44        README.md
     45Please, commit your changes or stash them before you can switch branches.
     46Aborting
     47Unable to checkout '21955012a27c340a4f812b1cee8c79d15c122900' in submodule path 'sub1' ||
     48|| Detached || Uncommitted change || Behind || error: Your local changes to the following files would be overwritten by checkout:
     49        README.md
     50Please, commit your changes or stash them before you can switch branches.
     51Aborting
     52Unable to checkout '21955012a27c340a4f812b1cee8c79d15c122900' in submodule path 'sub1' ||
    4553|| Detached || Committed change || Up-to-date ||  ||
    4654|| Detached || Committed change || Behind ||  ||
    47 || {{{master}}} || Unmodified || Up-to-date || ||
    48 || {{{master}}} || Unmodified || Behind || ||
     55|| {{{master}}} || Unmodified || Up-to-date || Detached ||
     56|| {{{master}}} || Unmodified || Behind || Updated (but '''not detached''') ||
    4957|| {{{master}}} || Uncommitted change || Up-to-date ||  ||
    5058|| {{{master}}} || Uncommitted change || Behind ||  ||
    5159|| {{{master}}} || Committed change || Up-to-date ||  ||
    5260|| {{{master}}} || Committed change || Behind ||  ||
    53 || {{{develop}}} || Unmodified || Up-to-date || ||
    54 || {{{develop}}} || Unmodified || Behind || ||
     61|| {{{develop}}} || Unmodified || Up-to-date || Detached ||
     62|| {{{develop}}} || Unmodified || Behind || Detached, updated ||
    5563|| {{{develop}}} || Uncommitted change || Up-to-date ||  ||
    5664|| {{{develop}}} || Uncommitted change || Behind ||  ||