|
If you were logged in you would be able to see more operations.
|
|
|
|
Original Estimate:
|
Unknown
|
Remaining Estimate:
|
Unknown
|
Time Spent:
|
Unknown
|
|
| Build: |
5,690
|
| Severity: |
Medium
|
|
invoke cvs update for the file that is modified both locally and on server
the Merge dialog with 3 panes (local + result + repository) appears.
after you resove all changes from right or left panes (for example, copy all changes from the last repository version to central (merge results) pane), you get a dialog prompting to finish merging, though the local changes have not been merged to result pane yet. If you press Continue, the changes appear not highlighted.
|
|
Description
|
invoke cvs update for the file that is modified both locally and on server
the Merge dialog with 3 panes (local + result + repository) appears.
after you resove all changes from right or left panes (for example, copy all changes from the last repository version to central (merge results) pane), you get a dialog prompting to finish merging, though the local changes have not been merged to result pane yet. If you press Continue, the changes appear not highlighted. |
Show » |
| There are no comments yet on this issue.
|
|
Bug
Open
Normal
CVS Merge: while merging local and repository versions don't prompt to finish after all changes from one version resolving