No, don't lose the .hgignore file; use "hg revert" on it. The problem has evolved into "why did Mercurial think that it should no longer be tracking those files?" If you have not used hg rm, or moved them, I don't see why that would be the case.
The state of your workspace appears to be consistent with removing them from SCM control, except for the fact that they don't show up as removed in any changeset history. If you still have a pre-fixed version of this workspace, what does "hg log -f -v usr/src/uts/common/inet/ip/ip_sadb.c" report? --Mark Dan McDonald wrote: > On Thu, Nov 06, 2008 at 05:42:58PM +0000, Stacey Jonathan Marshall wrote: >> Might you have specifically mentioned that file by name? >> >> try 'hg commit usr/.../sab.h usr/.../ip_sadb.c' > > kebe(~)[0]% cd ws/bugfixes/usr/src/uts/common/inet/ > kebe(common/inet)[0]% hg commit sadb.h > abort: file sadb.h not tracked! > kebe(common/inet)[255]% cd ip > kebe(inet/ip)[0]% hg commit ip_sadb.c > abort: file ip_sadb.c not tracked! > kebe(inet/ip)[255]% hg commit sadb.c > nothing changed > kebe(inet/ip)[0]% hg commit ip.c > nothing changed > kebe(inet/ip)[0]% > > I picked ip.c also as an example of nothing-changed, and notice that it's > tracked!!! > >> With that ignore file still in place? I assume not. >> >> But then your prior 'hg list' had a question mark against it, and not an 'M' >> for modified so its possibly confused??? >> >> What happens when you: >> cp file bak >> hg revert file >> cat bak > file >> hg commit -m "just do it" file >> >> Where file is the file you want committed. > > That seems to do the trick! Thanks! > >> Playing around in a repo with .hgignore as above here sure does cause some >> confusion. > > So should I lose the .hgignore permanently? > > Dan > _______________________________________________ > scm-migration-dev mailing list > scm-migration-dev at opensolaris.org > http://mail.opensolaris.org/mailman/listinfo/scm-migration-dev
