If both main trunk and branch R18 are in sync till now, then you can
merge the changes with following with branch as working copy.
cvs update -j HEAD -j R18 your file names
This also assumes that there are no commits to main trunk after your
required changes. otherwise they will also be merged
news wrote:
I have a main trunk and a branch R18. Some changes (on 3
files) have been made by programmer on the main trunk but
they should have been done in the R18 branch. I'd like the
changes made on the three files to be merged (or just copied)
to the R18 branch. Of course, the R18
Hello,
Rohan Nandode [EMAIL PROTECTED] a écrit dans le message de
news:[EMAIL PROTECTED]
If both main trunk and branch R18 are in sync till now, then you can
merge the changes with following with branch as working copy.
cvs update -j HEAD -j R18 your file names
Thank you very much. It was
Hello,
Jim.Hyslop [EMAIL PROTECTED] a écrit dans le message de
news:[EMAIL PROTECTED]
Fixing this will be quite simple. For simplicity, I will assume that there
...
Thank you very much for this method. I didn't know it was possible to merge
2 versions in the same branch. I have to read some
From: Christine Freight ([EMAIL PROTECTED])
I am having a dispute with a co-worker over how to do something in CVS. I
was wondering if anyone out there can help? Here's the situation:
A branch (let's call it branchA) gets created off the main line. Then, at
some point in time, a branch
Thanks Steve.
Yep, I created a branch origin tag, so I know where the branch forked off.
I appreciate the help!
~Christine
Stephen Cameron [EMAIL PROTECTED] wrote in message
news:[EMAIL PROTECTED]...
From: Christine Freight ([EMAIL PROTECTED])
I am having a dispute with a co-worker over
At 23:42 27/09/2001 +, you wrote:
Development continues down branchA, and a new directory, with new files,
gets added and committed on branchA. This new directory is obviously not on
branchB, since it was created after branchA was created.
I would suggest that you perform the new additions
Susie writes:
On a specifie branch, I change a file's name from "old" to "new" (the
file content is also changed). Next I am going to merge the branch into
the HEAD.
I hope to see the file "old" is replaced with "new" in the HEAD after
the merge. Can I see it? ( I guess the case is:
- Original Message -
From: "Larry Jones" [EMAIL PROTECTED]
To: "Susie" [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Sent: Wednesday, April 11, 2001 10:21 AM
Subject: Re: merge a branch which contains a name-changed file
Susie writes:
On a specifie branch, I change a file's nam
