[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Question regarding merging
From: |
Norman Crisp |
Subject: |
Question regarding merging |
Date: |
Thu, 1 Dec 2005 11:10:28 -0500 |
Could someone please confirm that my steps to performing a merge from a
branch to trunk is correct.
1- fresh checkout of the trunk into an empty sandbox
- cvs checkout -P -kk module-name
2- update from the branch into the checked out trunk sandbox
- cvs update -kk -P -jlatest-good-tag-from-the-branch
3- resolve and conflicts that may have occurred
4- commit all changed files back into the truck
Historically I have found conflicts that are not really conflicts due to the
Revision keyword. This is why I specify -kk on both the initial checkout
from the trunk and also on the update from the branch. Although the results
look correct, I am not %100 certain that this is the correct method.
Thanks
Norm.
- Question regarding merging,
Norman Crisp <=