Re: "missing" file after merge

[Jim Hyslop]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Barry Pape wrote:
| I have an odd situation I am trying to resolve.  We have an project that
| has been branched and merged many times.  And I just merged and branched
| the project again today.  But after the merge a file (build.xml) is
| "missing" from HEAD (and subsequently the new branch, which is what
| alerted me to the issue).  I say missing because an update or checkout
| of HEAD does not retrieve the file, but it shows up in the log [1] and I
| cannot add a new file called build.xml [2].
| Any ideas how I can resolve the issue and keep the history of the file?

The good news is the history is still there. We just have to figure out
how to fix your little problem :-)

Does checking it out into a clean directory retrieve the file?

| total revisions: 10;    selected revisions: 10
| description:
| ----------------------------
| revision 1.7
| date: 2007/10/25 20:33:59;  author: bpape;  state: Exp;  lines: +13 -1

In the log, do any of the "state" fields contain anything other than "Exp"?

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
~                 Consulting * Mentoring * Training in
~    C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHhE7SLdDyDwyJw+MRAonLAKDm+VANaP8mftOQ5ckSDW6QUZYqBgCgkFBZ
gI4ggkz1CxqgJ8NGzCfBWB4=
=s4EQ
-----END PGP SIGNATURE-----