Quoth Roman Belenov <[email protected]>:
> 
> I have some issues with git (after bind -ac /dist/plan9front)
> 
> 1.git/diff -s produces a lot of messages like
> 
> R lib/1oct1993/0310.ms
> 
> What are these files? Is it possible to get rid of it?

This was a bug in git, where we would get confused converting
a file into a directory of the same name, and vice versa. I
think the most overkill way to get out of it is, once you have
an up to date git:

        # make git9 forget this file exists, so that
        # when we revert it, we don't get confused
        grep -v 1oct1993 /.git/INDEX9 > /.git/INDEX9.tmp
        mv /.git/INDEX9.tmp /.git/INDEX9

        # remove and recreate the files
        git/rm -rf /lib/1oct1993
        git/revert /lib/1oct1993

I think git/rm followed by git/revert may also work, but my
memory of what to do to get past this is fading.


------------------------------------------
9fans: 9fans
Permalink: 
https://9fans.topicbox.com/groups/9fans/Te1af7af5b9f41987-Md94c9fa65f8cea1e6f18d659
Delivery options: https://9fans.topicbox.com/groups/9fans/subscription

Reply via email to