how to update manifest for all repo mirror branches
Bernard Talbert
mirror ...
http://groups.google.com/group/repo-discuss/browse_thread/thread/4016...
http://groups.google.com/group/repo-discuss/browse_thread/thread/da98...
So I tried creating a mirror but I can't figure out how to correctly
modify the manifest for all the different branches. The repo has like
5 different branches I need to
change manifest for so users pull from mirror.
Here's what I tried which fails when I try switching over to the next
branch.
What am I doing wrong here?
server% repo init -u git://android.git.kernel.org/platform/manifest.git
--mirror
server% repo sync
server% cd .repo/manifest
server% vi default.xml # change fetch to use local mirror
server% git commit -a -m "update manifest to use local mirror"
server% cd ../..
server% repo init -b mips-froyo # switch to another branch
.repo/manifests/: manifest switched refs/heads/master...mips-froyo
.repo/manifests/: discarding 14 commits removed from upstream
project .repo/manifests/
First, rewinding head to replay your work on top of it...
Applying: update manifest to use local mirror
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging default.xml
CONFLICT (content): Merge conflict in default.xml
Recorded preimage for 'default.xml'
Failed to merge in the changes.
Patch failed at 0001 update manifest to use local mirror
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --
skip".
To restore the original branch and stop rebasing run "git rebase --
abort".
fatal: cannot create default in manifest
Magnus Bäck
Bernard Talbert <bernard...@gmail.com> wrote:
> I was reading a couple old threads discussing how to create a repo
> mirror ...
>
> http://groups.google.com/group/repo-discuss/browse_thread/thread/4016...
>
> http://groups.google.com/group/repo-discuss/browse_thread/thread/da98...
These links are truncated.
> So I tried creating a mirror but I can't figure out how to correctly
> modify the manifest for all the different branches. The repo has like
> 5 different branches I need to
> change manifest for so users pull from mirror.
>
> Here's what I tried which fails when I try switching over to the next
> branch.
> What am I doing wrong here?
Nothing. For some reason the change you made on the master branch
doesn't apply cleanly to the mips-froyo branch. Solve the conflict
according to the instructions and you're done.
Take some time to think about what happens when you sync the next
time and the upstream manifest has been updated. Repo will rebase
your commit on top of the upstream tip, rewriting the branch history.
I gather this workspace is a mirror workspace that your users will
clone from, and in that case I'd avoid rewriting the history. By
creating a separate branch for your adaptations and keep that up to
date by merging from upstream you'll accomplish that.
[...]
--
Magnus Bäck Opinions are my own and do not necessarily
SW Configuration Manager represent the ones of my employer, etc.
Sony Ericsson