How can i easily( ;) ) pull the changes from redhat branches to the
vanilla kernel branch ?. Today i some how made up my mind to switch to
redhat tree and sadly found that redhat kernel doesn't build on alpha. I
don't want to fix that tooo. So the only option left for me is to use
the vanilla tree and make sure it is in sync with the redhat branch.
Any help ?. I tried
cvs -z3 update -j SSI-RH-2_4_18-18:4/22/03 -j SSI-RH-2_4_18-18:4/19/03 .
But it gives me conflicts. Should i merge those files manually. ??
From: Brian J. Watson <Brian.J.W<atson@hp...> - 2003-04-22 21:23:22
Aneesh Kumar K.V wrote:
> Any help ?. I tried
> cvs -z3 update -j SSI-RH-2_4_18-18:4/22/03 -j SSI-RH-2_4_18-18:4/19/03 .
The ordering of dates is wrong. This would attempt to _remove_ changes
that don't exist on the trunk. I believe the trunk and RH branch
diverged as of the 0.9.6 release, so try doing this:
cvs -z3 up -jSSI-RH-0_9_6 -jSSI-RH-2_4_18-18
> But it gives me conflicts. Should i merge those files manually. ??
There will almost always be conflicts that need to be merged by hand.
You can get a list of the conflicting files with:
cvs -q up | grep '^C'
When editing the files to resolve the conflicts, search for the string
'<<<<<'. You'll find it at the beginning of every conflicting section.
After you've resolved everything, checkin the changes to the trunk. One
other thing you can do to help with future merges is to tag the RH branch:
cvs -z3 co -r SSI-RH-2_4_18-18
cvs tag -F TRUNK-MERGE
The -F option to cvs tag is not really necessary the first time you make
the tag, but it will be when you want to move the tag in the future.
With this tag, you can do future merges like so:
cvs -z3 up -jTRUNK-MERGE -jSSI-RH-2_4_18-18
Hope this helps,
Get latest updates about Open Source Projects, Conferences and News.