In fact, fossil is saying that the merge between a file and a deleted file is a deleted file. Which is something to what I would strongly agree.
RR 2009/12/11 Will Duquette <[email protected]>: > On Dec 11, 2009, at 6:48 AM, Ramon Ribó wrote: > >> What I meant was the following: >> >> rm file1 >> fossil update >> >> in others VCS like CVS, file "file1" would appear again on disk. in >> fossil it does not. >> >> fossil revert file1 >> >> Now, it appears on disk > > Oh, yuck. I could have sworn that I'd tried that and had fossil > update recover deleted files; but you're right, it doesn't. That's > not good. > > Will > >> >> >> ---- >> Compass Ing. y Sistemas Dr. Ramon Ribo >> http://www.compassis.com [email protected] >> c/ Tuset, 8 7-2 tel. +34 93 218 19 89 >> 08006 Barcelona, Spain fax. +34 93 396 97 46 >> >> >> >> 2009/12/11 Jeremy Cowgar <[email protected]>: >>> =?ISO-8859-1?Q?Ramon_Rib=F3?= <[email protected]> wrote: >>>>> This is a proposal for how I think "fossil rm" should work. It's >>>>> consistent with how "svn rm" works. >>>>> At present it's not what happens. >>>> >>>> >>>> I was refering to the fact that "fossil update" currently does not >>>> recreate >>>> a deleted file. It is necessary to do a "fossil revert". There are >>>> some people, >>>> myself included, that think that "fossil update" should recreate >>>> deleted files. >>>> >>> >>> What's also interesting in this debate say you do (currently) >>> >>> $ fossil rm zip.c >>> $ fossil status >>> DELETED zip.c >>> $ fossil revert zip.c >>> revert file 'zip.c'? this will destory local changes [y/N]? y >>> $ fossil status >>> DELETED zip.c >>> $ fossil add zip.c >>> ADDED zip.c >>> $ fossil status >>> no output except common headers >>> >>> i.e. fossil revert does not place a DELETED file back into the repo. >>> >>> Jeremy >>> >>> >>> _______________________________________________ >>> fossil-users mailing list >>> [email protected] >>> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil- >>> users >>> >>> >> _______________________________________________ >> fossil-users mailing list >> [email protected] >> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > ------------------------------------------------------------------ > will -at- wjduquette.com | Catch our weblog, > http://foothills.wjduquette.com/blog | The View from the Foothills > > > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
