Fossil

Check-in [1dc38811]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Update json status page for "merge --integrate"
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:1dc3881129c85d7791871e54bb574b1367f291e0
User & Date: jan.nijtmans 2013-08-26 11:56:35
Context
2013-08-26
18:00
Fix typos in the "fossil update" logic. check-in: 5a1d13ee user: drh tags: trunk
11:56
Update json status page for "merge --integrate" check-in: 1dc38811 user: jan.nijtmans tags: trunk
08:40
Report syntax errors in T-cards for events when they happen, not when the complete manifest is parsed already. check-in: 512cc197 user: jan.nijtmans tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/json_status.c.

124
125
126
127
128
129
130




131
132
133
134
135
136
137
        zStatus = "missing";
        ++nErr;
      }
    }else if( 2==isChnged ){
      zStatus = "updatedByMerge";
    }else if( 3==isChnged ){
      zStatus = "addedByMerge";




    }else if( 1==isChnged ){
      if( file_contains_merge_marker(zFullName) ){
        zStatus = "conflict";
      }else{
        zStatus = "edited";
      }
    }







>
>
>
>







124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
        zStatus = "missing";
        ++nErr;
      }
    }else if( 2==isChnged ){
      zStatus = "updatedByMerge";
    }else if( 3==isChnged ){
      zStatus = "addedByMerge";
    }else if( 4==isChnged ){
      zStatus = "updatedByIntegrate";
    }else if( 5==isChnged ){
      zStatus = "addedByIntegrate";
    }else if( 1==isChnged ){
      if( file_contains_merge_marker(zFullName) ){
        zStatus = "conflict";
      }else{
        zStatus = "edited";
      }
    }