|
If you were logged in you would be able to see more operations.
|
|
|
|
Original Estimate:
|
Unknown
|
Remaining Estimate:
|
Unknown
|
Time Spent:
|
Unknown
|
|
- rename externally package mypack to mypack_renamed and commit
- locally rename class mypack.C1 to mypack.C2
- update project:
---> file appears as need merge. Merge:
you are prompted to choose either to keep local name (mypack.C2.java), or accept server name (mypack_renamed.C1.java), or to provide different name.
- Select one of them and merge contents in dialog (take package prefix from server and class name from local copy)
---> For first 2 options results are incorrect absolutely (unversioned files/packages appear)
If you type manually the path like mypack_renamed.C2.java, the result is correct in the file point of view. However, for some reasons the package prefix (copied from server version in Merge dialog) is not applied: the resulted class has incorrect prefix 'mypack'.
|
|
Description
|
- rename externally package mypack to mypack_renamed and commit
- locally rename class mypack.C1 to mypack.C2
- update project:
---> file appears as need merge. Merge:
you are prompted to choose either to keep local name (mypack.C2.java), or accept server name (mypack_renamed.C1.java), or to provide different name.
- Select one of them and merge contents in dialog (take package prefix from server and class name from local copy)
---> For first 2 options results are incorrect absolutely (unversioned files/packages appear)
If you type manually the path like mypack_renamed.C2.java, the result is correct in the file point of view. However, for some reasons the package prefix (copied from server version in Merge dialog) is not applied: the resulted class has incorrect prefix 'mypack'.
|
Show » |
| There are no comments yet on this issue.
|
|
Bug
Open
Normal
TFS: merge results are incorrect on external package rename + local class rename