I've managed to replicate this with a p4 repo.
The history of the file in p4 shows:
[amyers@erdinger:main]$ p4 filelog //depot/branches/8.0/bsd.txt //depot/branches/8.0/bsd.txt ... #2 change 76 integrate on 2010/10/01 by amyers@erdinger (text) 'merging ' ... ... copy from //depot/main/bsd.txt#2 ... #1 change 74 branch on 2010/10/01 by amyers@erdinger (text) 'merge to branch ' ... ... branch from //depot/main/bsd.txt#1
What I did on the repo:
[amyers@erdinger:main]$ p4 add bsd.txt //depot/main/bsd.txt#1 - opened for add ... add content to file ... [amyers@erdinger:main]$ p4 submit Change 73 created with 1 open file(s). Submitting change 73. Locking 1 files ... add //depot/main/bsd.txt#1 Change 73 submitted. [amyers@erdinger:main]$ p4 integ //depot/main/... //depot/branches/8.0/... [amyers@erdinger:main]$ p4 submit Change 74 created with 1 open file(s). Submitting change 74. Locking 1 files ... branch //depot/branches/8.0/bsd.txt#1 Change 74 submitted. [amyers@erdinger:main]$ p4 edit bsd.txt //depot/main/bsd.txt#1 - opened for edit ... make change to file ... [amyers@erdinger:main]$ p4 submit Change 75 created with 1 open file(s). Submitting change 75. Locking 1 files ... edit //depot/main/bsd.txt#2 Change 75 submitted. [amyers@erdinger:main]$ p4 integ //depot/main/... //depot/branches/8.0/... //depot/branches/8.0/bsd.txt#1 - integrate from //depot/main/bsd.txt#2 [amyers@erdinger:main]$ p4 resolve /Users/amyers/p4reps/test-project/branches/8.0/bsd.txt - merging //depot/main/bsd.txt#2 Diff chunks: 0 yours + 1 theirs + 0 both + 0 conflicting Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) at: dt 1c1 < Copyright (c) <year>, <copyright holder> --- > Copyright (c) 2010, Andrew Myers Accept(a) Edit(e) Diff(d) Merge (m) Skip(s) Help(?) at: at //erdinger/branches/8.0/bsd.txt - copy from //depot/main/bsd.txt [amyers@erdinger:main]$ p4 submit Change 76 created with 1 open file(s). Submitting change 76. Locking 1 files ... integrate //depot/branches/8.0/bsd.txt#2 Change 76 submitted.
Creating a review from the FishEye changeset 76 works correctly:
But if I create the review in crucible, select only the file in changeset 76:
I then use the "Add Revisions" option to add changeset 74 to the review:
And bsd.txt will now show up twice in the directory tree as per the following screenshot:
Something is going wrong with the "Add Revisions" option that makes it think the old revision is a different file.
- is duplicated by
-
CRUC-5880 File list displaying the same file twice, impacting diffs
-
- Closed
-
-
-
- Closed
-
- is related to
-
-
- Closed
-
