Fossil SCM
fix "possible unresolved merge conflict" warning message to show the pathname relative to the wd in stead of the root
Commit
2a15d87edbd7948467ee03912088802951c96845
Parent
c8e72df08eeaeac…
1 file changed
+5
-1
+5
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1223,13 +1223,17 @@ | ||
| 1223 | 1223 | }else{ |
| 1224 | 1224 | blob_read_from_file(&content, zFullname); |
| 1225 | 1225 | } |
| 1226 | 1226 | if( !crnlOk ) cr_warning(&content, zFullname); |
| 1227 | 1227 | if( chnged==1 && contains_merge_marker(&content) ){ |
| 1228 | + Blob fname; /* Relative pathname of the file */ | |
| 1229 | + | |
| 1228 | 1230 | nConflict++; |
| 1231 | + file_relative_name(zFullname, &fname, 0); | |
| 1229 | 1232 | fossil_print("possible unresolved merge conflict in %s\n", |
| 1230 | - zFullname+strlen(g.zLocalRoot)); | |
| 1233 | + blob_str(&fname)); | |
| 1234 | + blob_reset(&fname); | |
| 1231 | 1235 | } |
| 1232 | 1236 | nrid = content_put(&content); |
| 1233 | 1237 | blob_reset(&content); |
| 1234 | 1238 | if( rid>0 ){ |
| 1235 | 1239 | content_deltify(rid, nrid, 0); |
| 1236 | 1240 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1223,13 +1223,17 @@ | |
| 1223 | }else{ |
| 1224 | blob_read_from_file(&content, zFullname); |
| 1225 | } |
| 1226 | if( !crnlOk ) cr_warning(&content, zFullname); |
| 1227 | if( chnged==1 && contains_merge_marker(&content) ){ |
| 1228 | nConflict++; |
| 1229 | fossil_print("possible unresolved merge conflict in %s\n", |
| 1230 | zFullname+strlen(g.zLocalRoot)); |
| 1231 | } |
| 1232 | nrid = content_put(&content); |
| 1233 | blob_reset(&content); |
| 1234 | if( rid>0 ){ |
| 1235 | content_deltify(rid, nrid, 0); |
| 1236 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1223,13 +1223,17 @@ | |
| 1223 | }else{ |
| 1224 | blob_read_from_file(&content, zFullname); |
| 1225 | } |
| 1226 | if( !crnlOk ) cr_warning(&content, zFullname); |
| 1227 | if( chnged==1 && contains_merge_marker(&content) ){ |
| 1228 | Blob fname; /* Relative pathname of the file */ |
| 1229 | |
| 1230 | nConflict++; |
| 1231 | file_relative_name(zFullname, &fname, 0); |
| 1232 | fossil_print("possible unresolved merge conflict in %s\n", |
| 1233 | blob_str(&fname)); |
| 1234 | blob_reset(&fname); |
| 1235 | } |
| 1236 | nrid = content_put(&content); |
| 1237 | blob_reset(&content); |
| 1238 | if( rid>0 ){ |
| 1239 | content_deltify(rid, nrid, 0); |
| 1240 |