On Mon, Dec 22, 2003 at 01:46:55PM -0600, Ken Williams wrote:
> But another thing is that everyone I talk to who's used it seems to
> like it, which is probably worth a lot.
It is nice.
The two things I know that it can't do are
1: If you create a file as part of one submit, and then change it as part of
a subsequent submit, you can't integrate both "changes" onto another
branch as part of a single submit. I've been bitten by this twice in the
past 3 months - it's a strange deficiency.
2: You can't back out an integration. There's a FAQ item about how to do it -
ie kludge it. (p4 edit the relevant files, get the (forwards) diff,
patch -R, submit)
This sucks, because it's as if you did a local edit in that branch, which
means you can't (re)integrate the change, and any subsequent changes to
that area of code will become conflicts between the two branches.
Obviously these two are irritating if you're trying to merge changes over
from perl 5.9.x to perl 5.8.x
Nicholas Clark
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
|
