On Wed, Jul 13, 2011 at 5:02 PM, Martin S. Weber <martin.we...@nist.gov>wrote:
> Hello there! > > Recently I accidentally added some files that are automatically generated, > changing quite often and which I generally don't want under version control > at > all. So I deleted them (I used show files on the timeline, followed the > view > links on the files I wanted to get rid of, used the shun link on the files, > hit the shun button on the following page, and when I was done, I did an > fossil rebuild <bla>.fossil on the shell. Then on my local copy of the > thing, > I used fossil configuration pull shun <URL>, followed by a fossil rebuild > in > my open checkout). > You probably also need to "fossil rm" the files from the manifest. > > But when I'm looking at fossil status now, the files appear as: > EDITED path/to/file ... > > I'm confused. I expected these files to be gone (from the view of fossil)? > Is > there anything else I should have done? > > Here's a log of retrying it in a play fossil repository > > server $ cd ~/my-fossils # fossil is serving the directory > server $ fossil new tst.fossil > client $ fossil clone http://user@server:port/tst tst.fossil > client $ fossil open ./tst.fossil > client $ mkdir bla ; cd bla > client $ touch one > client $ fossil add one > client $ fossil ci > # after failure of auto-sync > client $ fossil remote-url http://user@server:port/tst > # enter password displayed on server for user > client $ fossil ci > # enter some message > > # now, go to http://server:port/tst > # select timeline > # show files -> view didn't work, so I clicked on the checkin's hash, > # selected the file and worked my way down until I had the shun link > # hit sun > # hit the shun button, > # see the shunned artifact id appear as a link > server $ fossil rebuild tst.fossil > # now the shunned artifact id no longer appears as a link > client $ echo change >> one > client $ fossil configuration pull shun http://user@server:port/tst > # enter user password > client $ fossil status > # ... EDITED bla/one > client $ fossil rebuild > client $ fossil status > # ... EDITED bla/one > > If I do a fossil ci now, it'll commit bla/one again, claiming it's a new > file. > > oh, and finally: > > client $ fossil version > This is fossil version [6b5c797cc3] 2010-12-27 06:15:41 UTC > server $ fossil version > This is fossil version [d8221b9863] 2011-05-12 14:56:52 UTC > > Pilot error? fossil version too old? bug in fossil and ticket appreciated? > > Thanks in advance, > > -Martin > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- D. Richard Hipp d...@sqlite.org
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users