Cc: SM-Commit Daemon <sm-commit AT lists.ibiblio.org>, duane_malcolm <d.malcolm AT auckland.ac.nz>, Unet <unet AT sourcemage.org>, Arjan Bouter <abouter AT sourcemage.org>, vladimir_marek <vlmarek AT volny.cz>, Ladislav Hagara <ladislav.hagara AT unob.cz>, Maurizio Boriani <baux AT member.fsf.org>, Ethan Grammatikidis <eekee AT eekee.is-a-geek.org>, Andrew Stitt <a AT thefrayedknot.armory.com>, Gareth Clay <gareth AT caffeinefuelled.co.uk>
Subject: Re: [SM-Commit] PERFORCE change 78543 by David Kowis for review
Date: Sat, 29 Apr 2006 19:50:37 -0700
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
David Kowis wrote:
<snip>
> Yeah it didn't, and when i try to do integrate again, it claims that
> it's fully integrated.... Could one of the l33t perforce admins save me?
<snip>
Usually to fix this I do a `p4 sync -f` on where I'm going to integrate
to and then do a `p4 integ -f <devel version>/... <test version>/... &&
p4 resolve -at <test version>/... && p4 submit`.