Fossil SCM

Merge trunk.

andygoth 2015-05-15 17:10 UTC andygoth-metadata-changes merge
Commit d186eb56f159dd61d7b0fbcb0e5d80785e31861e
Parent 849cf1d1a05121f…
4 files changed +5 -6 +5 -6 +1 +1
~ src/checkin.c ~ src/checkin.c ~ www/changes.wiki ~ www/changes.wiki
M src/checkin.c
+5 -6
--- src/checkin.c
+++ src/checkin.c
@@ -1908,11 +1908,11 @@
19081908
 /* Step 2: Insert records for all modified files into the blob
19091909
 ** table. If there were arguments passed to this command, only
19101910
 ** the identified files are inserted (if they have been modified).
19111911
 */
19121912
 db_prepare(&q,
1913
- "SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile "
1913
+ "SELECT id, %Q || pathname, mrid, %s, %s, %s FROM vfile "
19141914
 "WHERE chnged==1 AND NOT deleted AND is_selected(id)",
19151915
 g.zLocalRoot,
19161916
 glob_expr("pathname", db_get("crnl-glob","")),
19171917
 glob_expr("pathname", db_get("binary-glob","")),
19181918
 glob_expr("pathname", db_get("encoding-glob",""))
@@ -1919,19 +1919,18 @@
19191919
 );
19201920
 while( db_step(&q)==SQLITE_ROW ){
19211921
 int id, rid;
19221922
 const char *zFullname;
19231923
 Blob content;
1924
- int crnlOk, binOk, encodingOk, chnged;
1924
+ int crnlOk, binOk, encodingOk;
19251925
19261926
 id = db_column_int(&q, 0);
19271927
 zFullname = db_column_text(&q, 1);
19281928
 rid = db_column_int(&q, 2);
19291929
 crnlOk = db_column_int(&q, 3);
1930
- chnged = db_column_int(&q, 4);
1931
- binOk = db_column_int(&q, 5);
1932
- encodingOk = db_column_int(&q, 6);
1930
+ binOk = db_column_int(&q, 4);
1931
+ encodingOk = db_column_int(&q, 5);
19331932
19341933
 blob_zero(&content);
19351934
 if( file_wd_islink(zFullname) ){
19361935
 /* Instead of file content, put link destination path */
19371936
 blob_read_link(&content, zFullname);
@@ -1941,11 +1940,11 @@
19411940
 /* Do not emit any warnings when they are disabled. */
19421941
 if( !noWarningFlag ){
19431942
 abortCommit |= commit_warning(&content, crnlOk, binOk,
19441943
 encodingOk, zFullname);
19451944
 }
1946
- if( chnged==1 && contains_merge_marker(&content) ){
1945
+ if( contains_merge_marker(&content) ){
19471946
 Blob fname; /* Relative pathname of the file */
19481947
19491948
 nConflict++;
19501949
 file_relative_name(zFullname, &fname, 0);
19511950
 fossil_print("possible unresolved merge conflict in %s\n",
19521951
--- src/checkin.c
+++ src/checkin.c
@@ -1908,11 +1908,11 @@
1908 /* Step 2: Insert records for all modified files into the blob
1909 ** table. If there were arguments passed to this command, only
1910 ** the identified files are inserted (if they have been modified).
1911 */
1912 db_prepare(&q,
1913 "SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile "
1914 "WHERE chnged==1 AND NOT deleted AND is_selected(id)",
1915 g.zLocalRoot,
1916 glob_expr("pathname", db_get("crnl-glob","")),
1917 glob_expr("pathname", db_get("binary-glob","")),
1918 glob_expr("pathname", db_get("encoding-glob",""))
@@ -1919,19 +1919,18 @@
1919 );
1920 while( db_step(&q)==SQLITE_ROW ){
1921 int id, rid;
1922 const char *zFullname;
1923 Blob content;
1924 int crnlOk, binOk, encodingOk, chnged;
1925
1926 id = db_column_int(&q, 0);
1927 zFullname = db_column_text(&q, 1);
1928 rid = db_column_int(&q, 2);
1929 crnlOk = db_column_int(&q, 3);
1930 chnged = db_column_int(&q, 4);
1931 binOk = db_column_int(&q, 5);
1932 encodingOk = db_column_int(&q, 6);
1933
1934 blob_zero(&content);
1935 if( file_wd_islink(zFullname) ){
1936 /* Instead of file content, put link destination path */
1937 blob_read_link(&content, zFullname);
@@ -1941,11 +1940,11 @@
1941 /* Do not emit any warnings when they are disabled. */
1942 if( !noWarningFlag ){
1943 abortCommit |= commit_warning(&content, crnlOk, binOk,
1944 encodingOk, zFullname);
1945 }
1946 if( chnged==1 && contains_merge_marker(&content) ){
1947 Blob fname; /* Relative pathname of the file */
1948
1949 nConflict++;
1950 file_relative_name(zFullname, &fname, 0);
1951 fossil_print("possible unresolved merge conflict in %s\n",
1952
--- src/checkin.c
+++ src/checkin.c
@@ -1908,11 +1908,11 @@
1908 /* Step 2: Insert records for all modified files into the blob
1909 ** table. If there were arguments passed to this command, only
1910 ** the identified files are inserted (if they have been modified).
1911 */
1912 db_prepare(&q,
1913 "SELECT id, %Q || pathname, mrid, %s, %s, %s FROM vfile "
1914 "WHERE chnged==1 AND NOT deleted AND is_selected(id)",
1915 g.zLocalRoot,
1916 glob_expr("pathname", db_get("crnl-glob","")),
1917 glob_expr("pathname", db_get("binary-glob","")),
1918 glob_expr("pathname", db_get("encoding-glob",""))
@@ -1919,19 +1919,18 @@
1919 );
1920 while( db_step(&q)==SQLITE_ROW ){
1921 int id, rid;
1922 const char *zFullname;
1923 Blob content;
1924 int crnlOk, binOk, encodingOk;
1925
1926 id = db_column_int(&q, 0);
1927 zFullname = db_column_text(&q, 1);
1928 rid = db_column_int(&q, 2);
1929 crnlOk = db_column_int(&q, 3);
1930 binOk = db_column_int(&q, 4);
1931 encodingOk = db_column_int(&q, 5);
 
1932
1933 blob_zero(&content);
1934 if( file_wd_islink(zFullname) ){
1935 /* Instead of file content, put link destination path */
1936 blob_read_link(&content, zFullname);
@@ -1941,11 +1940,11 @@
1940 /* Do not emit any warnings when they are disabled. */
1941 if( !noWarningFlag ){
1942 abortCommit |= commit_warning(&content, crnlOk, binOk,
1943 encodingOk, zFullname);
1944 }
1945 if( contains_merge_marker(&content) ){
1946 Blob fname; /* Relative pathname of the file */
1947
1948 nConflict++;
1949 file_relative_name(zFullname, &fname, 0);
1950 fossil_print("possible unresolved merge conflict in %s\n",
1951
M src/checkin.c
+5 -6
--- src/checkin.c
+++ src/checkin.c
@@ -1908,11 +1908,11 @@
19081908
 /* Step 2: Insert records for all modified files into the blob
19091909
 ** table. If there were arguments passed to this command, only
19101910
 ** the identified files are inserted (if they have been modified).
19111911
 */
19121912
 db_prepare(&q,
1913
- "SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile "
1913
+ "SELECT id, %Q || pathname, mrid, %s, %s, %s FROM vfile "
19141914
 "WHERE chnged==1 AND NOT deleted AND is_selected(id)",
19151915
 g.zLocalRoot,
19161916
 glob_expr("pathname", db_get("crnl-glob","")),
19171917
 glob_expr("pathname", db_get("binary-glob","")),
19181918
 glob_expr("pathname", db_get("encoding-glob",""))
@@ -1919,19 +1919,18 @@
19191919
 );
19201920
 while( db_step(&q)==SQLITE_ROW ){
19211921
 int id, rid;
19221922
 const char *zFullname;
19231923
 Blob content;
1924
- int crnlOk, binOk, encodingOk, chnged;
1924
+ int crnlOk, binOk, encodingOk;
19251925
19261926
 id = db_column_int(&q, 0);
19271927
 zFullname = db_column_text(&q, 1);
19281928
 rid = db_column_int(&q, 2);
19291929
 crnlOk = db_column_int(&q, 3);
1930
- chnged = db_column_int(&q, 4);
1931
- binOk = db_column_int(&q, 5);
1932
- encodingOk = db_column_int(&q, 6);
1930
+ binOk = db_column_int(&q, 4);
1931
+ encodingOk = db_column_int(&q, 5);
19331932
19341933
 blob_zero(&content);
19351934
 if( file_wd_islink(zFullname) ){
19361935
 /* Instead of file content, put link destination path */
19371936
 blob_read_link(&content, zFullname);
@@ -1941,11 +1940,11 @@
19411940
 /* Do not emit any warnings when they are disabled. */
19421941
 if( !noWarningFlag ){
19431942
 abortCommit |= commit_warning(&content, crnlOk, binOk,
19441943
 encodingOk, zFullname);
19451944
 }
1946
- if( chnged==1 && contains_merge_marker(&content) ){
1945
+ if( contains_merge_marker(&content) ){
19471946
 Blob fname; /* Relative pathname of the file */
19481947
19491948
 nConflict++;
19501949
 file_relative_name(zFullname, &fname, 0);
19511950
 fossil_print("possible unresolved merge conflict in %s\n",
19521951
--- src/checkin.c
+++ src/checkin.c
@@ -1908,11 +1908,11 @@
1908 /* Step 2: Insert records for all modified files into the blob
1909 ** table. If there were arguments passed to this command, only
1910 ** the identified files are inserted (if they have been modified).
1911 */
1912 db_prepare(&q,
1913 "SELECT id, %Q || pathname, mrid, %s, chnged, %s, %s FROM vfile "
1914 "WHERE chnged==1 AND NOT deleted AND is_selected(id)",
1915 g.zLocalRoot,
1916 glob_expr("pathname", db_get("crnl-glob","")),
1917 glob_expr("pathname", db_get("binary-glob","")),
1918 glob_expr("pathname", db_get("encoding-glob",""))
@@ -1919,19 +1919,18 @@
1919 );
1920 while( db_step(&q)==SQLITE_ROW ){
1921 int id, rid;
1922 const char *zFullname;
1923 Blob content;
1924 int crnlOk, binOk, encodingOk, chnged;
1925
1926 id = db_column_int(&q, 0);
1927 zFullname = db_column_text(&q, 1);
1928 rid = db_column_int(&q, 2);
1929 crnlOk = db_column_int(&q, 3);
1930 chnged = db_column_int(&q, 4);
1931 binOk = db_column_int(&q, 5);
1932 encodingOk = db_column_int(&q, 6);
1933
1934 blob_zero(&content);
1935 if( file_wd_islink(zFullname) ){
1936 /* Instead of file content, put link destination path */
1937 blob_read_link(&content, zFullname);
@@ -1941,11 +1940,11 @@
1941 /* Do not emit any warnings when they are disabled. */
1942 if( !noWarningFlag ){
1943 abortCommit |= commit_warning(&content, crnlOk, binOk,
1944 encodingOk, zFullname);
1945 }
1946 if( chnged==1 && contains_merge_marker(&content) ){
1947 Blob fname; /* Relative pathname of the file */
1948
1949 nConflict++;
1950 file_relative_name(zFullname, &fname, 0);
1951 fossil_print("possible unresolved merge conflict in %s\n",
1952
--- src/checkin.c
+++ src/checkin.c
@@ -1908,11 +1908,11 @@
1908 /* Step 2: Insert records for all modified files into the blob
1909 ** table. If there were arguments passed to this command, only
1910 ** the identified files are inserted (if they have been modified).
1911 */
1912 db_prepare(&q,
1913 "SELECT id, %Q || pathname, mrid, %s, %s, %s FROM vfile "
1914 "WHERE chnged==1 AND NOT deleted AND is_selected(id)",
1915 g.zLocalRoot,
1916 glob_expr("pathname", db_get("crnl-glob","")),
1917 glob_expr("pathname", db_get("binary-glob","")),
1918 glob_expr("pathname", db_get("encoding-glob",""))
@@ -1919,19 +1919,18 @@
1919 );
1920 while( db_step(&q)==SQLITE_ROW ){
1921 int id, rid;
1922 const char *zFullname;
1923 Blob content;
1924 int crnlOk, binOk, encodingOk;
1925
1926 id = db_column_int(&q, 0);
1927 zFullname = db_column_text(&q, 1);
1928 rid = db_column_int(&q, 2);
1929 crnlOk = db_column_int(&q, 3);
1930 binOk = db_column_int(&q, 4);
1931 encodingOk = db_column_int(&q, 5);
 
1932
1933 blob_zero(&content);
1934 if( file_wd_islink(zFullname) ){
1935 /* Instead of file content, put link destination path */
1936 blob_read_link(&content, zFullname);
@@ -1941,11 +1940,11 @@
1940 /* Do not emit any warnings when they are disabled. */
1941 if( !noWarningFlag ){
1942 abortCommit |= commit_warning(&content, crnlOk, binOk,
1943 encodingOk, zFullname);
1944 }
1945 if( contains_merge_marker(&content) ){
1946 Blob fname; /* Relative pathname of the file */
1947
1948 nConflict++;
1949 file_relative_name(zFullname, &fname, 0);
1950 fossil_print("possible unresolved merge conflict in %s\n",
1951
M www/changes.wiki
+1
--- www/changes.wiki
+++ www/changes.wiki
@@ -33,10 +33,11 @@
3333
 checked into the repository.
3434
 * Update the built-in SQLite to version 3.8.10.1.
3535
 * Make [/help?cmd=open|fossil open] honor ".fossil-settings/allow-symlinks".
3636
 * Allow [/help?cmd=add|fossil add] to be used on symlinks to nonexistent or
3737
 unreadable files in the same way as [/help?cmd=addremove|fossil addremove].
38
+ * Added fork warning to be issued if sync produced a fork
3839
 * Have [/help/cmd=changes|fossil changes] and
3940
 [/help/cmd=status|fossil status] report when executable or symlink status
4041
 changes on otherwise unmodified files.
4142
4243
 <h2>Changes for Version 1.32 (2015-03-14)</h2>
4344
--- www/changes.wiki
+++ www/changes.wiki
@@ -33,10 +33,11 @@
33 checked into the repository.
34 * Update the built-in SQLite to version 3.8.10.1.
35 * Make [/help?cmd=open|fossil open] honor ".fossil-settings/allow-symlinks".
36 * Allow [/help?cmd=add|fossil add] to be used on symlinks to nonexistent or
37 unreadable files in the same way as [/help?cmd=addremove|fossil addremove].
 
38 * Have [/help/cmd=changes|fossil changes] and
39 [/help/cmd=status|fossil status] report when executable or symlink status
40 changes on otherwise unmodified files.
41
42 <h2>Changes for Version 1.32 (2015-03-14)</h2>
43
--- www/changes.wiki
+++ www/changes.wiki
@@ -33,10 +33,11 @@
33 checked into the repository.
34 * Update the built-in SQLite to version 3.8.10.1.
35 * Make [/help?cmd=open|fossil open] honor ".fossil-settings/allow-symlinks".
36 * Allow [/help?cmd=add|fossil add] to be used on symlinks to nonexistent or
37 unreadable files in the same way as [/help?cmd=addremove|fossil addremove].
38 * Added fork warning to be issued if sync produced a fork
39 * Have [/help/cmd=changes|fossil changes] and
40 [/help/cmd=status|fossil status] report when executable or symlink status
41 changes on otherwise unmodified files.
42
43 <h2>Changes for Version 1.32 (2015-03-14)</h2>
44
M www/changes.wiki
+1
--- www/changes.wiki
+++ www/changes.wiki
@@ -33,10 +33,11 @@
3333
 checked into the repository.
3434
 * Update the built-in SQLite to version 3.8.10.1.
3535
 * Make [/help?cmd=open|fossil open] honor ".fossil-settings/allow-symlinks".
3636
 * Allow [/help?cmd=add|fossil add] to be used on symlinks to nonexistent or
3737
 unreadable files in the same way as [/help?cmd=addremove|fossil addremove].
38
+ * Added fork warning to be issued if sync produced a fork
3839
 * Have [/help/cmd=changes|fossil changes] and
3940
 [/help/cmd=status|fossil status] report when executable or symlink status
4041
 changes on otherwise unmodified files.
4142
4243
 <h2>Changes for Version 1.32 (2015-03-14)</h2>
4344
--- www/changes.wiki
+++ www/changes.wiki
@@ -33,10 +33,11 @@
33 checked into the repository.
34 * Update the built-in SQLite to version 3.8.10.1.
35 * Make [/help?cmd=open|fossil open] honor ".fossil-settings/allow-symlinks".
36 * Allow [/help?cmd=add|fossil add] to be used on symlinks to nonexistent or
37 unreadable files in the same way as [/help?cmd=addremove|fossil addremove].
 
38 * Have [/help/cmd=changes|fossil changes] and
39 [/help/cmd=status|fossil status] report when executable or symlink status
40 changes on otherwise unmodified files.
41
42 <h2>Changes for Version 1.32 (2015-03-14)</h2>
43
--- www/changes.wiki
+++ www/changes.wiki
@@ -33,10 +33,11 @@
33 checked into the repository.
34 * Update the built-in SQLite to version 3.8.10.1.
35 * Make [/help?cmd=open|fossil open] honor ".fossil-settings/allow-symlinks".
36 * Allow [/help?cmd=add|fossil add] to be used on symlinks to nonexistent or
37 unreadable files in the same way as [/help?cmd=addremove|fossil addremove].
38 * Added fork warning to be issued if sync produced a fork
39 * Have [/help/cmd=changes|fossil changes] and
40 [/help/cmd=status|fossil status] report when executable or symlink status
41 changes on otherwise unmodified files.
42
43 <h2>Changes for Version 1.32 (2015-03-14)</h2>
44

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button