StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POCan I reconstruct Perforce/Mercurial linkage after an aborted Perfarce clone?
text
Body
copied!<p>I have hit a problem with the Perfarce extension that I can’t seem to get past. I initially cloned part of my P4 depot by:</p> <pre><code>hg clone --startrev 71555 p4://perforce:1666/greg_nt_main-hg lwnthg </code></pre> <p>I chose a start rev that was just a few changelists behind the current head revision – trying a full clone with no startrev didn’t work, but that’s a separate issue I’ll perhaps write about separately.</p> <p>During the clone I got the following error:</p> <pre><code>"abort:untracked file in working directory differs from requested revision on 'MAIN/apps/Win32/BenchMark/Jamfile'” </code></pre> <p>However, on inspection of what had appeared on my disk, it looked like all files had in fact been successfully cloned. The file mentioned was identical to that in Peforce, and the lwnthg folder was empty before the clone process. An ‘hg status’ showed a lot of files that had not yet been committed – I guess because the clone aborted? So I committed them, and all looked to be great.</p> <p>I made some edits to my files, committed them to the local repo without problems. I enjoyed the loveliness of Mercurial ;)</p> <p>But when I came to push my changes back to Perforce I get the following error:</p> <pre><code>abort: no p4 changelist revision found </code></pre> <p>I verified I had a valid P4 login ticket, P4 was up, etc, and all OK.</p> <p>So my guess is that Perfarce stores somewhere the changelist that it last synced to from P4, and the first abort happened before this info was written out. If I try a pull operation from P4, I also get the same error. Assuming my theory is correct, is there any way to reconstruct this information in the local Perfarce config? </p> <p><strong>NOTE</strong> 'Perfarce' is NOT a typo. It is the <a href="http://mercurial.selenic.com/wiki/PerfarceExtension" rel="nofollow">name of the Mercurial extension</a> to link to Perforce. The question loses some of its meaning if you change it to 'Perforce'. Appreciate the help in trying to clear up the question, but always worth checking facts first :)</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload