Confirmed users, Bureaucrats and Sysops emeriti
792
edits
Using Mercurial locally with CVS: Difference between revisions
Jump to navigation
Jump to search
no edit summary
No edit summary |
No edit summary |
||
| Line 90: | Line 90: | ||
255 a4a7678829ff 2007-07-31 13:31 -0700 vladimir | 255 a4a7678829ff 2007-07-31 13:31 -0700 vladimir | ||
cvs sync | cvs sync | ||
Now you want to get it into CVS: | |||
% cd cvssrc/mozilla | |||
% hg pull ../../mozilla <i>this is the cloned mozilla repo</i> | |||
pulling from ../../mozilla | |||
searching for changes | |||
adding changesets | |||
adding manifests | |||
adding file changes | |||
added 1 changesets with 1 changes to 1 files | |||
(run 'hg update' to get a working copy) | |||
At this point, your repository contains the changesets from ../../mozilla. However, your working dir does not: | |||
% hg parent | |||
255 a4a7678829ff 2007-07-31 13:31 -0700 vladimir | |||
cvs sync | |||
% hg tip | |||
256[tip] 603e507ddf25 2007-07-31 13:41 -0700 vladimir | |||
Add mystery message to README.txt | |||
Note that the parent of your working dir is rev 255, whereas the tip of the repository is 256. Because CVS has no knowledge about what's in the hg repository, we need to get our working dir up to date: | |||
% hg update | |||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
Now, you can do the cvs commit: | |||
% cvs commit -m "b=123456, Add mystery message to README.txt, r=sparky" README.txt | |||