问题
I want to merge a file from one branch to another branch in clearcase,
for example from Offshore
branch to DEV
branch.
I want to merge the file with its modification time as it is.
If the modification date of a file (example.asp
) is 12-02-2011
, after merging the file in DEV
branch, the modification time for the file (example.asp
) in DEV
branch should hold the same modification time (12-02-2011
).
Which view should I take?
how should I do merge?
Note: I tried preserve modification time option while checkin and checkout during merging.
回答1:
The view is easy: when merging, always do so in the destination view, ie in the view which contains the destination version of your merge.
From there, you can display the version tree of that file, and look for the "source version" (the one from which you want to merge, in your case, the one on Offshore branch).
You can right click on the source version and select "Merge to", and then the destination version (the one designated by an "eye").
ClearCase will ask you if you want to checkout that file (say yes) and will perform the merge (but will not checkin the file).
You can then check if the "preserve modification time" applies in your case.
来源:https://stackoverflow.com/questions/12088657/merge-file-from-one-barnch-to-another-branch-in-clearcase