There had some code refactoring between nuxeo 5.1 and 5.2 making difficult to work on both. Especially, if you need to merge some changes from one branch to another. More, switching from 5.1 to 5.2 makes Eclipse hang.
Here is simple way to work on both branches. We assume you have installed forest extension (if not, simply reproduce the procedure on all sub-repositories) and Nuxeo shell functions (see Downloading Nuxeo Sources)
Now, you are able to commit on 5.1, merge on 5.2, commit on 5.2 and push the whole:
Updating your sources is done pulling on 5.2 and, then, pulling on 5.1:
For import into Eclipse, you have to use two different workspaces, one for each version.
Remember nuxeo-5.1 is a clone of your local nuxeo-5.2 which is a clone of public repository; here is the result of "hg path":
hg fclone https://hg.nuxeo.org/nuxeo/ nuxeo-5.2 cd nuxeo-5.2 # remove unused repositories in 5.2 rm -rf nuxeo-platform nuxeo-shell hgx 5.2 1.5 up -C cd .. hg fclone $PWD/nuxeo-5.2/ nuxeo-5.1 cd nuxeo-5.1 # remove unused repositories in 5.1 and add missing ones rm -rf nuxeo-services nuxeo-jsf nuxeo-features nuxeo-dm nuxeo-webengine nuxeo-gwt hg clone https://hg.nuxeo.org/nuxeo/nuxeo-platform/ hg clone https://hg.nuxeo.org/nuxeo/nuxeo-shell/ hgx 5.1 1.4 up -C cd ..
cd nuxeo-5.1 # do some work... hg ci -m"NXP-9999 - some work" # push your changeset(s) to your local nuxeo-5.2 repository hg push cd ../nuxeo-5.2 hg merge 5.1 # do some work... hg ci -m"merge 5.1" # push your changesets to public Nuxeo repository hg push
cd nuxeo-5.2 hgf pull cd ../nuxeo-5.1 hgf pull
cd nuxeo-5.2 && hg path default = https://hg.nuxeo.org/nuxeo/ cd ../nuxeo-5.1 && hg path default = /path/to/your/workspace/nuxeo-5.2/
Version 7.1 last modified by Julien Carsique on 30/04/2009 at 15:13
Document data
Attachments:
No attachments for this document
Comments: 0