To: SM-Commit Daemon <sm-commit AT lists.ibiblio.org>
Subject: Re: [SM-Commit] PERFORCE change 80018 by Arjan Bouter for review
Date: Wed, 31 May 2006 14:22:59 -0700
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Perforce Review Daemon wrote:
> Change 80018 by arjan_bouter@abouter-laptop on 2006/05/31 17:11:04
>
> added suxpanel entry to the changelog
>
> Affected files ...
>
> ... //sgl/grimoires/devel/ChangeLog#340 edit
> ... //sgl/grimoires/test/ChangeLog#291 edit
<snip>
I'll repeat it again, do /not/ edit ChangeLog in test for this. Edit and
submit to devel and then integrate your change and only your change from
devel to test.
$ p4 edit devel/ChangeLog
$ vi devel/ChangeLog
$ p4 submit devel/ChangeLog
Submitted ChangeLog#399
$ p4 integ devel/ChangeLog#399,#399 test/ChangeLog
$ p4 resolve -am test/ChangeLog
$ p4 diff test/ChangeLog
If needed, run `p4 resolve test/ChangeLog` to fix it (your directly
editing test makes this more likely for the rest of us)
$ p4 submit test/ChangeLog