[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
merging branch into trunk while keeping trunk fixes
From: |
David Everly |
Subject: |
merging branch into trunk while keeping trunk fixes |
Date: |
Mon, 3 Dec 2001 11:09:02 -0700 |
User-agent: |
Mutt/1.2.5i |
I have branch MY_BRANCH and HEAD development. There have been fixes
to HEAD and new development that does not have these fixes on
MY_BRANCH. It seems that the fixes to HEAD are not retained when, in
my HEAD work area, I do cvs update -j MY_BRANCH. Instead, files which
seem to have not changed replace the files that have been changed and
commited to HEAD.
Am I doing something wrong here? Do I have to merge HEAD fixes into
MY_BRANCH first?
Thanks,
Dave.
- merging branch into trunk while keeping trunk fixes,
David Everly <=