On 2/17/2016 7:51 AM, Warren Young wrote:
On Feb 17, 2016, at 8:17 AM, Andy Bradford <amb-fos...@bradfords.org> wrote:
....
Just to clarify, are you doing both a rename and an add on the old
filename that was renamed in the same stash?
I’m doing “fossil mv --hard some/file.cpp other/file.cpp” then
attempting to stash all uncommitted changes. (i.e. “fossil stash save -m
blahblah”)
But in
http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg22595.html
you said
However, this nonstandard option is not at fault per se. This also triggers it
with a default build:
mv foo.c bar.c
f mv --soft foo.c bar.c
f stash
So, the problem is trying to stash a renamed file.
Using the current trunk on Windows in a 32-bit build, fossil stash
correctly stashes a renamed file, if the file was also renamed on disk,
and if no new file is using the old name.
fossil mv --soft old new works, but the subsequent fossil stash save -m
"soft" fails with "ERROR: no such file: ....new".
fossil mv --hard old new; touch old; fossil stash -m "both" fails to
stash with the SQLITE_CONSTRAINT message.
Various combinations also cause fossil stash diff to complain. The stash
currently is quite touchy about renamed and deleted files.
--
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
