Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch pending-review Excluding Merge-Ins
This is equivalent to a diff from 94b9530774 to a9afb1f049
|
2016-02-15
| ||
| 17:43 | Update SQLite to version 3.11.0 final. Leaf check-in: 7ad8230273 user: drh tags: trunk | |
|
2016-02-13
| ||
| 06:57 | Updated stash.test to reflect the incidental changes in output caused by the changes made in [fea4d80ee7]. Leaf check-in: a9afb1f049 user: rberteig tags: pending-review | |
| 05:00 | If a file has been renamed in a stash, restore this information also in the vfile table so it doesn't show up as MISSING. check-in: fea4d80ee7 user: andybradford tags: pending-review | |
| 02:42 | More fossil stash cases, this time with snapshot and interesting results of fossil stash diff in when a DELETE was snapshotted. check-in: 94b9530774 user: rberteig tags: trunk | |
|
2016-02-12
| ||
| 19:53 | Added new edge case tests to stash.test, related to stashing renamed files. check-in: 34cf38b097 user: rberteig tags: trunk | |
Changes to src/stash.c.
| ︙ | ︙ | |||
276 277 278 279 280 281 282 283 284 285 286 287 288 289 |
blob_reset(&b);
blob_reset(&disk);
}
blob_reset(&delta);
if( fossil_strcmp(zOrig,zNew)!=0 ){
undo_save(zOrig);
file_delete(zOPath);
}
}
stash_add_files_in_sfile(vid);
db_finalize(&q);
if( nConflict ){
fossil_print(
"WARNING: %d merge conflicts - see messages above for details.\n",
| > > > > > | 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 |
blob_reset(&b);
blob_reset(&disk);
}
blob_reset(&delta);
if( fossil_strcmp(zOrig,zNew)!=0 ){
undo_save(zOrig);
file_delete(zOPath);
db_multi_exec(
"UPDATE vfile SET pathname='%q', origname='%q'"
" WHERE pathname='%q' %s AND vid=%d",
zNew, zOrig, zOrig, filename_collation(), vid
);
}
}
stash_add_files_in_sfile(vid);
db_finalize(&q);
if( nConflict ){
fossil_print(
"WARNING: %d merge conflicts - see messages above for details.\n",
|
| ︙ | ︙ |
Changes to test/stash.test.
| ︙ | ︙ | |||
188 189 190 191 192 193 194 |
UPDATE f2
UPDATE f3n
ADDED f0
} -changes {
ADDED f0
MISSING f1
EDITED f2
| | < < | 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 |
UPDATE f2
UPDATE f3n
ADDED f0
} -changes {
ADDED f0
MISSING f1
EDITED f2
RENAMED f3n
} -addremove {
DELETED f1
} -exists {f0 f2 f3n} -notexists {f1 f3}
# Confirm there is no longer a stash saved
fossil stash list
test stash-2-list {[first_data_line] eq "empty stash"}
|
| ︙ | ︙ | |||
293 294 295 296 297 298 299 | repo_init write_file f1 "f1" write_file f2 "f2" fossil add f1 f2 fossil commit -m "baseline" fossil mv --hard f2 f2n | | | < | < < | 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 |
repo_init
write_file f1 "f1"
write_file f2 "f2"
fossil add f1 f2
fossil commit -m "baseline"
fossil mv --hard f2 f2n
test_result_state stash-3-2-mv "mv --hard f2 f2n" \
"RENAME f2 f2n\n MOVED_FILE [file normalize f2]" \
-changes {
RENAMED f2n
} -addremove {
} -exists {f1 f2n} -notexists {f2}
stash-test 3-2 {save -m f2n} {
REVERT f2
DELETE f2n
} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
fossil stash show
test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]}
stash-test 3-2-pop {pop} {
UPDATE f1
UPDATE f2n
} -changes {
RENAMED f2n
} -addremove {
} -exists {f1 f2n} -notexists {f2} -knownbugs {-changes}
########
# fossil stash snapshot ?-m|--comment COMMENT? ?FILES...?
|
| ︙ | ︙ |