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: | Chuck Karish (kar...@well.com) |
| Date: | 08/06/2002 09:12:28 PM |
| List: | com.perforce.perforce-user |
Oh, I see. Your problem statement was rather terse.
As Dave Lewis pointed out, 'p4 filelog -i' follows the integration by which the file was created. It doesn't follow merges, meaning integrations that added modifications after the file is created.
It's a bit more complicated to trace merges, but it's doable. You have to look up the change number of the merge in the filelog of the file on the other branch. This doesn't immediately tell you which modifications were merged if the integration was done by changelist rather than by filename. I haven't looked at this problem for a while, but I remember that there was a way to retrieve that information.
At 10:44 PM 8/6/2002 -0500, Patrick Bennett wrote:
Make another change in foo (foo #2) and re-integrate it into bar (#2). You won't see the edit comment for foo #2.
Chuck Karish wrote:
At 11:09 AM 8/6/2002 -0500, Patrick Bennett wrote:
You're mistaken....
edit a file in branch a.
submit the change with the comment 'added some test text'
now, integ branch a to branch b and do a filelog -i on the file in branch b.
Give the new changelist you submit (for the integration) the description 'test
integration'
You will see that 'added some test text' is nowhere to be seen in the filelog -i
OK, I added a file (change 40), integrated it to another file (change 41) and ran 'p4 -i' on the new file. Both changes show up in the output. Without '-i' only the integration shows up.
Please show me where I'm mistaken.
Chuck Karish
Script started on Tue Aug 6 19:26:12 2002
bash-2.04$ touch foo
bash-2.04$ p4 add foo
//pluto/dogbert/tmp/foo#1 - opened for add
/tmp/foo - empty, assuming text.
bash-2.04$ p4 submit
Submitting change 40.
[ editing session elided ]
Locking 1 files ...
add //pluto/dogbert/tmp/foo#1
Change 40 submitted.
bash-2.04$ p4 integ foo bar
//pluto/dogbert/tmp/bar#1 - branch/sync from //pluto/dogbert/tmp/foo#1
bash-2.04$ p4 submit
[ editing session elided ]
Submitting change 41.
Locking 1 files ...
branch //pluto/dogbert/tmp/bar#1
Change 41 submitted.
bash-2.04$ p4 filelog -i bar
//pluto/dogbert/tmp/bar
... #1 change 41 branch on 2002/08/06 by <mailto:Chuck_Karish at
karish.dogbert>Chuck_Karish at karish.dogbert (text) 'Branched from foo. '
... ... branch from //pluto/dogbert/tmp/foo#1
//pluto/dogbert/tmp/foo
... #1 change 40 add on 2002/08/06 by <mailto:Chuck_Karish at
karish.dogbert>Chuck_Karish at karish.dogbert (text) 'Test file. '
... ... branch into //pluto/dogbert/tmp/bar#1
bash-2.04$ p4 filelog bar
//pluto/dogbert/tmp/bar
... #1 change 41 branch on 2002/08/06 by <mailto:Chuck_Karish at
karish.dogbert>Chuck_Karish at karish.dogbert (text) 'Bra
nched from foo. '
... ... branch from //pluto/dogbert/tmp/foo#1
bash-2.04$
Chuck Karish wrote:
In my experience filelog -i shows comments for all changelists back to file
creation,
crossing to other branches at integration changelists.
At 09:01 AM 8/6/2002 -0500, Patrick Bennett wrote:
Nope - doesn't do it. All that will do is show the comments for the
>integration< changelists..
He's wanting to see the comments for the changelists of the edits from those
other branches.
Stephen Vance wrote:
The comments are still in Perforce. You just need to add the -i flag to the
filelog command to see them. That will cause the command to follow integration
links, as well.
At 11:50 AM 8/5/2002 -0700, Novikoff, Eric wrote:
We have begun using feature branches to help decouple multiple slightly-related feature development efforts. When the feature is merged back to mainline periodically, we do the merge as a single changelist, which loses all the individual checkin comments made by developers working in the branch. Is there another way to do this that preserves the comments in mainline? Is it easy? -eric
Chuck Karish <mailto:karish at well.com>karish at well.com
(415) 317-0182
Chuck Karish karish at well.com (415) 317-0182