Fossil

Check-in [a9afb1f0]
Login

Check-in [a9afb1f0]

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

Overview
Comment:Updated stash.test to reflect the incidental changes in output caused by the changes made in [fea4d80ee7].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | stash-fixes
Files: files | file ages | folders
SHA1: a9afb1f0497efee1c2c4498899ca1beec88455cb
User & Date: rberteig 2016-02-13 06:57:17.526
Context
2016-02-17
04:49
Given that both origname and newname are always provided when stashing a file, allow both a rename and an add by changing the PRIMARY KEY for stashfile. This does mean the schema for stashfile has changed and to take advantage it will be necessary to close and open the repository again (or update manually with SQL). ... (check-in: ca574f81 user: andybradford tags: stash-fixes)
2016-02-13
06:57
Updated stash.test to reflect the incidental changes in output caused by the changes made in [fea4d80ee7]. ... (check-in: a9afb1f0 user: rberteig tags: stash-fixes)
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: fea4d80e user: andybradford tags: stash-fixes)
Changes
Unified Diff Ignore Whitespace Patch
Changes to test/stash.test.
︙︙
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206

  UPDATE f2
  UPDATE f3n
  ADDED  f0
} -changes {
  ADDED      f0
  MISSING    f1
  EDITED     f2
  MISSING    f3
} -addremove {
  ADDED  f3n
  DELETED  f1
  DELETED  f3
} -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"}










|

<

<








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
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
325
326
327
328
329

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-4-mv "mv --hard f2 f2n" {
  RENAME f2 f2n
  MOVED_FILE 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 {
  ADDED  f2n
  DELETED  f2
} -exists {f1 f2n} -notexists {f2} -knownbugs {-changes}



########
# fossil stash snapshot ?-m|--comment COMMENT? ?FILES...?









|
|
<
|

















<
<








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...?
︙︙