[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Dhruva B. Reddy
Tue, 12 Oct 2004 14:08:37 -0700 (PDT)
We are doing development on a branch which has been around for a while,
and I was required to merge in changes from the trunk a few times.
The first time I did this, I did the following (in a sandbox from the
cvs up -j HEAD
and then applied a tag as recommended by the documentation. This merge
went as expected (changes made on the trunk were now available in the
branch, along with the changes checked into the branch).
A few days ago I merged changes from the trunk again. I could have
sworn I did it like this (again, in a sandbox from the branch):
cvs up -j <tag created after last merge> -j HEAD
This resulted in the loss of *all* changes made on the branch (i.e.,
they were overridden by the versions on the trunk).
Can anyone tell me what could have caused this (what kind of human
error, etc.) and how to prevent from happening again?
Do you Yahoo!?
Declare Yourself - Register online to vote today!
- Merging Issues,
Dhruva B. Reddy <=