20 messages in com.perforce.perforce-user[p4] Preserving checkin comments from...| From | Sent On | Attachments |
|---|---|---|
| Novikoff, Eric | 05 Aug 2002 11:37 | |
| Novikoff, Eric | 05 Aug 2002 11:50 | |
| Stephen Vance | 06 Aug 2002 04:42 | |
| Patrick Bennett | 06 Aug 2002 07:01 | |
| Chuck Karish | 06 Aug 2002 09:02 | |
| Patrick Bennett | 06 Aug 2002 09:09 | |
| Robert Prentice | 06 Aug 2002 10:13 | |
| Patrick Bennett | 06 Aug 2002 10:42 | |
| Dave Lewis | 06 Aug 2002 11:10 | |
| Patrick Bennett | 06 Aug 2002 11:29 | |
| ste...@vance.com | 06 Aug 2002 12:04 | |
| Jeffrey Jensen | 06 Aug 2002 12:32 | |
| Dave Foglesong | 06 Aug 2002 12:42 | |
| Dave Foglesong | 06 Aug 2002 12:52 | |
| Patrick Bennett | 06 Aug 2002 14:30 | |
| ste...@vance.com | 06 Aug 2002 14:50 | |
| Chuck Karish | 06 Aug 2002 20:41 | |
| Patrick Bennett | 06 Aug 2002 20:43 | |
| Chuck Karish | 06 Aug 2002 21:12 | |
| Chuck Karish | 06 Aug 2002 21:15 |
| Subject: | [p4] Preserving checkin comments from feature branches.![]() |
|---|---|
| From: | Dave Foglesong (dfog...@adobe.com) |
| Date: | 08/06/2002 12:42:43 PM |
| List: | com.perforce.perforce-user |
You get the change information for the original revisions that were used to create a file via integrate. But subsequent integrates don't carry forward the change comments for the revisions being integrated. For example:
//test/a/foo.txt #1 = add //test/a/foo.txt #2 = edit //test/a/foo.txt #3 = edit //test/a/foo.txt #4 = edit //test/a/foo.txt #5 = edit
//test/b/foo.txt #1 = add via integrate from //test/a/foo.txt#1,3 //test/b/foo.txt #2 = edit //test/b/foo.txt #3 = edit via integrate from //test/b/foo.txt#4,5
p4 filelog -i //test/b/foo.txt
... #3 change 503 integrate on 2002/08/06 by dfogleso at dfogleso-t21 (text) 'Anoth er integrate from "a" to "' ... ... copy from //test/a/foo.txt#4,#5 ... #2 change 502 edit on 2002/08/06 by dfogleso at dfogleso-t21 (text) 'An update on codeline "b". ' ... #1 change 499 branch on 2002/08/06 by dfogleso at dfogleso-t21 (text) 'Integrat ion from codeline "a" t' ... ... branch from //test/a/foo.txt#1,#3 //test/a/foo.txt ... #3 change 498 edit on 2002/08/06 by dfogleso at dfogleso-t21 (text) 'Another up date on codeline "a".' ... ... branch into //test/b/foo.txt#1 ... #2 change 497 edit on 2002/08/06 by dfogleso at dfogleso-t21 (text) 'An update on codeline "a". ' ... #1 change 496 add on 2002/08/06 by dfogleso at dfogleso-t21 (text) 'Initial add of file. '
This is on 2001.1. I don't know if 2002.1 (or earlier versions) work differently.
This is exactly as it's described to work. From "p4 help filelog":
The -i flag follows branches. If a file was created by branching, 'p4 filelog' also lists the revisions of the source file, but only those revisions leading up to the branch point.
Dave Foglesong Adobe Systems 206.675.7412
-----Original Message----- From: perforce-user-admin at perforce.com [mailto:perforce-user-admin at perforce.com]On Behalf Of steve at vance.com Sent: Tuesday, August 06, 2002 7:51 AM To: Patrick Bennett; Robert Prentice; perforce-user Subject: Re: [p4] Preserving checkin comments from feature branches.
Now I'm surprised. What version of the server are you using? I relied on this feature very heavily when it first came out, and it behaved as I described.
Does anyone have any counter-examples and if so, can you supply the server version?
Stephen Vance
Robert Prentice wrote:
Can someone generate an appropriate example, so that we can see where this information shows up, if indeed it does? Thanks! ...Rob Prentice
p4 filelog -l -i bs.txt
//depot/systest/eic/ivy/products/bs.txt .... #9 change 761 integrate on 2002/08/06 by patrickb at PatrickB (text)
Automated Integration from systest/eic/gray to systest/eic/grayint
.... ... copy from //depot/systest/eic/gray/products/bs.txt#15,#20 .... #8 change 759 integrate on 2002/08/06 by patrickb at PatrickB (text)
Automated Integration from systest/eic/main to systest/eic/grayint
.... ... copy from //depot/systest/eic/main/products/bs.txt#5 .... #7 change 753 integrate on 2002/08/05 by PatrickB at PatrickB (text)
Automated Integration from systest/eic/main to systest/eic/grayint
.... ... copy from //depot/systest/eic/main/products/bs.txt#4 ....... etc
Hmm - what's missing here? :> Here's the filelog on the file in /systest/eic/gray
p4 filelog -l bs.txt
//depot/systest/eic/gray/products/bs.txt .... #20 change 760 edit on 2002/08/06 by patrickb at PatrickB (text)
"another test edit"
.... ... copy into //depot/systest/eic/grayint/products/bs.txt#10 .... ... copy into //depot/systest/eic/ivy/products/bs.txt#9 .... ... copy into //depot/systest/eic/yellow/products/bs.txt#7 .... #19 change 757 edit on 2002/08/06 by patrickb at PatrickB (text)
"another test edit"
.... ... copy into //depot/systest/eic/main/products/bs.txt#5
etc. etc.
Notice the change descriptions? "Another test edit" That description (and change) does >NOT< show up in the filelog -i on the integration >to< side. I repeat, the people who think this is the case are mistaken. It only shows the integrated >changelists< - which will contain the integrations only - not the "changelists for the edits that were integrated"
_______________________________________________ perforce-user mailing list - perforce-user at perforce.com http://maillist.perforce.com/mailman/listinfo/perforce- user
--------------------------------------------- This message was sent using WebMail by ValueWeb. http://www.valueweb.net/webmail
_______________________________________________ perforce-user mailing list - perforce-user at perforce.com http://maillist.perforce.com/mailman/listinfo/perforce-user




