[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Update with two -j opions or merging selected changes
From: |
Michael Farthing |
Subject: |
Update with two -j opions or merging selected changes |
Date: |
Mon, 23 Oct 2006 08:28:06 +1000 |
Hello,
I have used and administered cvs for quite a while and thought I
understood most aspects of cvs pretty well, but have a scenario I don't
understand.
I am trying to merge selected changes onto a branch. In effect I have a
release branch, into which I need to merge a bugfix which was performed
on the main line. (To extract the essence of the problem I am having, I
will describe this in terms of revisions and a single file, although in
reality I need to work with tags and multiple files.)
I have a branch in a file (called afile). This branch is 1.13.2 and I
have a revision on the branch 1.13.2.1. This is what I have checked
out. Changes have been made on the trunk: 1.14, 1.15, 1.16
So, I currently have:
|
1.13---(1.13.2)
| |
1.14 1.13.2.1
|
1.15
|
1.16
Now, I want the changes made between 1.15 and 1.16 merged into my
working copy (which is currently 1.13.2.1). I try using the command:
cvs up -j1.15 -j1.16 afile
What I get are the 1.13.2.1 with all of the changes between 1.13 and
1.16, when I only want those between 1.15 and 1.16
(I have tried this with both V1.11.17 and V1.11.22.)
Any assistance would be much appreciated.
Regards,
Michael Farthing
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Update with two -j opions or merging selected changes,
Michael Farthing <=