Testing it is the first thing to do. There's always ClockWorkMod and nandroid backups to fall back to. But yeah, it probably won't even boot until you have the sources set up properly. CM10 would have been easier...
How about merging the two manifest into one and saving it as ./repo/local_manifest.xml. It's deprecated method but it works with older repo versions.
$ grep url android/.repo/repo/.git/config
url = https://git.chromium.org/git/external/repo
"repo init" used that version which it found first from $PATH at that time?
I'd guess it would work if I rm -rf .repo/repo and replace it with latest git-repo from https://gerrit.googl...ce.com/git-repo
But with local_manifest.xml and repo 1.19 I got some extra stuff happening:
Syncing work tree: 100% (360/360), done.
build/: discarding 1 commits
device/zte/atlas40/: leaving cm-10.1; does not track upstream
hardware/atheros/wifi/libs/: leaving cm-10.1; does not track upstream
hardware/qcom/display-legacy/: leaving jellybean; does not track upstream
hardware/qcom/media-legacy/: leaving cm-10.1; does not track upstream
kernel/zte/zte-kernel-msm7x27a/: leaving jellybean; does not track upstream
system/core/: discarding 1 commits
vendor/cm/: discarding 3 commits
vendor/zte/: leaving cm-10.1; does not track upstream
Package complete: /wrk/safari/cvs/android/out/target/product/atlas40/cm-10.1-20130413-UNOFFICIAL-atlas40.zip
Edited by Otila, 13 April 2013 - 02:30 PM.