On Wed 12 Nov 2003 17:41, [EMAIL PROTECTED] wrote: > > > > > After two people have p4 edit'ed the same revision of a file > there are at least two possible usage scenarios: > > 0). One of you issues 'p4 revert perl/Configure' and waits for the other to > submit their change. After that the other person can issue 'p4 sync > perl/Configure' and sync out the submitted change and can then continue > (i.e. issue p4 edit and p4 submit). > This method serializes the changes made to the file.
This is what I did > 1). Neither of you reverts the file and one submits. When the second > person goes to submit their changelist it will be marked as 'pending' > rather than submitted and won't go into the depot until after a > p4 resolve is done to merge and/or edit the changes. > This method allows for merging concurrent changes (note that the merge > utility embeded within the p4 resolve command is not unlike RCS merge > and can leave lines with '>>>' and '<<<' merge conflict markers within > a source files if you are not careful with the 'am' command (e.g. you > and Jarkko both changed the very same line in the file)). > > I hope that helps. Yes and no. Yes, since 0) is what I did, I now know I did the right thing No, I did get no respons to the patch announcement, from not even one person on the Cc list, so either - nobody cares - all agree - nobody understands Now I'd just like to know what Jarkko is changing, so I could maybe anticipate on that. Let's just hope he did not accidently leave a dangling open p4 edit > Peter Prymmer > > "H.Merijn Brand" <[EMAIL PROTECTED]> wrote on 11/12/2003 10:59:34 AM: > > > l1:/pro/3gl/CPAN 193 > p4 sedit perl/Configure > > //depot/perl/Configure#550 - updating /pro/3gl/CPAN/perl/Configure > > //depot/perl/Configure#550 - opened for edit > > ... //depot/perl/Configure - also opened by [EMAIL PROTECTED] > > > > > > Uhhh, and next? -- H.Merijn Brand Amsterdam Perl Mongers (http://amsterdam.pm.org/) using perl-5.6.1, 5.8.0, & 5.9.x, and 806 on HP-UX 10.20 & 11.00, 11i, AIX 4.3, SuSE 8.2, and Win2k. http://www.cmve.net/~merijn/ http://archives.develooper.com/[EMAIL PROTECTED]/ [EMAIL PROTECTED] send smoke reports to: [EMAIL PROTECTED], QA: http://qa.perl.org
