On 2/12/2016 9:02 PM, Andy Bradford wrote:
Thus said Ross Berteig on Fri, 12 Feb 2016 11:53:38 -0800:
2. The file rename is not rescheduled. It says:
MISSING zip.c
Reproduced in the test case. Which I will commit any minute now.
I saw this too a couple days ago and began working on a fix. I believe
the following will address this particular problem:
http://www.fossil-scm.org/index.html/info/fea4d80ee7b880bb
If someone will review and provide feedback, I'll feel better about it
being merged.
Thanks,
Andy
I poked at this change with stash.test.
* It changed the output seen by fossil stash pop when it reapplied a
stash containing a renamed file. It has said "MISSING old" and now says
"RENAMED new". That is probably sane.
* It didn't affect some of the other oddities. Not a surprise.
* I had missed a detail in the output of a fossil mv --hard that caused
a false positive. I also missed a cut-n-paste error in the test id of
that test.
* The issue is directly covered by test ids stash-3-2 and
stash-3-2-show-1. Those still fail. That is, the untouched file f1 is
still named with an empty diff in the stash, and is reverted when the
stash is made.
* But the term MISSING is not longer applied to the renamed file.
* The previously failing stash-3-2-pop-changes now passes because after
popping the stash, fossil changes used to say "MISSING f2" and now says
"RENAMED f2n".
* The test stash-3-2-pop-addremove had the wrong expected list. After
popping the rename, there is no reason for fossil addremove to see any
work to do.
The bottom line is that this change caused me to reexamine and fix my
test cases, both in your pending-review branch, and on trunk. From what
I see in stash.test, it is beneficial.
I think I'm going to stash my changes to stash.test on trunk until after
this merges to make that merge less painful.
Someone better versed in the SQL innards will have to speak to the
actual changes you made, I have not evaluated it from that point of view.
--
Ross Berteig r...@cheshireeng.com
Cheshire Engineering Corp. http://www.CheshireEng.com/
+1 626 303 1602
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
