AOSP Mirror - Creating a new branch

222 views
Skip to first unread message

Ne0

unread,
Aug 16, 2013, 5:14:41 AM8/16/13
to android-...@googlegroups.com
Hello,

I have a mirror of the AOSP using gitolite and want to create a new branch from one of the Android builds so checked out the branch I wanted to branch from.

repo init -u git@development:android.git/platform/manifest.git -b android-4.2.2_r1.2 

I then ran repo sync before creating a new branch .repo/manifests 4.2.2-my-branch and edited it to this

<remote  name="development"
          fetch=".." />
<default revision="4.2.2-my-branch"
          remote="development"

and pushed it. I then ran 'repo forall -c "git checkout -b 4.2.2-my-branch; git push --all development"' Which created the branch on all projects and pushed the branch successfully.

All looked good so i did another repo init with -b 4.2.2-my-branch and sync'd.

Everything looked good (well the same as before, as i expected). To test that it was working i created a branch in the build project to track my remote 4.2.2-my-branch, edited a file and pushed it, then did a repo sync.

The sync worked, but when I checked the build project it was in the wrong place, it was back at the original place and not at head of the remote branch.

Has anyone got any advice on how to branch an android build properly using repo?

Magnus Bäck

unread,
Aug 20, 2013, 12:09:41 PM8/20/13
to android-...@googlegroups.com
On Friday, August 16, 2013 at 05:14 EDT,
Ne0 <liamjam...@googlemail.com> wrote:

> I have a mirror of the AOSP using gitolite and want to create a new
> branch from one of the Android builds so checked out the branch I
> wanted to branch from.

I think this topic was covered by the repo-discuss thread on Friday.

https://groups.google.com/d/topic/repo-discuss/SxFpRbAu1fs/discussion

If not, perhaps you can follow up in that thread?

[...]

--
Magnus Bäck
ba...@google.com
Reply all
Reply to author
Forward
0 new messages