[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Merging from HEAD to branch
From: |
Jesus M. Salvo Jr. |
Subject: |
Merging from HEAD to branch |
Date: |
Thu, 23 Jan 2003 13:25:07 +1100 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.2.1) Gecko/20021130 |
1) Created a branch. changes were being committed on the branch.
2) At the same time, changes were being committed on the main tree ( HEAD ).
3) Merged the changes from the main tree to branch and then committed
the merge on the branch. The main tree was tagged ( called
mergedtobranch_ 20030117 ) so that I know at what point in the main tree
were changes applied to the branch. The branch was also tagged after the
merge-commit ( called mergedfrombranch_20030117 ).
My problem now is how to continually merge changes from the main tree to
the branch after the initial merge
Which one is the correct command?
Retrieve the branch ( cvs update -r branchname )
and then one of
cvs -z9 update -P -d -jmergedtobranch_20030117 -jbranchname
cvs -z9 update -P -d -jmergedfrombranch_20030117 -jbranchname
cvs -z9 update -P -d -jHEAD
cvs -z9 update -P -d -jHEAD -jbranchname
cvs -z9 update -P -d -jmergedtobranch_20030117 -jHEAD
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Merging from HEAD to branch,
Jesus M. Salvo Jr. <=