git - Android's Repo not syncing branches other than master -


i'm using repo multi-repository dev-environment.
when trying update repos, repo sync , output shows like:

... github.com:<repo-name>    1c9accf..4b2f449  feature/branch1 -> origin/feature/branch1 ...

feature/branch1 branch i'm working on , couple of commits behind origin/feature/branch1. tracking remote branch.

but after repo sync local branch still not updated. repositories still on master working fine - output following:

... fetching projects:  77% (7/9)  github.com:<repo-name-on-master>    eb99bff..372e69f  master     -> origin/master fetching projects: 100% (9/9), done.  <project-name>/: manifest switched refs/heads/master...master project <project-name>/ updating eb99bff..372e69f fast-forward  readme.md | 2 +-  1 file changed, 1 insertion(+), 1 deletion(-) ...

so last part - updating - not happening branch1. why that?

default.xml looks , in separate repo on github:

<?xml version="1.0" encoding="utf-8"?> <manifest>   <remote name="origin" fetch=".." />   <default revision="master" remote="origin" sync-j="4" />    <project name="repo-name" path="api" />   <project name="repo-name-2" path="docs" /> </manifest>

.git/config looks this:

[core]     repositoryformatversion = 0     filemode = true     ignorecase = true     precomposeunicode = true [filter "lfs"]     smudge = git-lfs smudge --skip -- %f [remote "origin"]     url = git@github.com:<repo-name>     projectname = <project-name>     fetch = +refs/heads/*:refs/remotes/origin/* [branch "master"]     remote = origin     merge = refs/heads/master [branch "feature/branch1"]     remote = origin     merge = refs/heads/feature/branch1

if project has been synchronized once, then repo sync is equivalent to:

git remote update

git rebase origin/< branch >

where < branch > is checked-out branch in local project directory. if local branch not tracking branch in remote repository, no synchronization occur project.

the commits remote feature branch there (unless remote tracking branch not configured correctly). not @ tip of local branch.


Comments

Post a Comment

Popular posts from this blog

sql server - Cannot query correctly (MSSQL - PHP - JSON) -

i have little problem on project. , turns out query result returns nothing when value of first name or last name has 'ñ' in it. here's code config.php: <?php ini_set('mssql.charset', 'utf-8'); header('content-type: text/html; charset=utf-8'); $servername = "192.168.1.21"; /* ip add of db server */ $connection = array("database" => "db", "uid" => "?", "pwd" => "***"); $conn = sqlsrv_connect($servername, $connection); if(!$conn){ echo "connection not established."; die(print_r(sqlsrv_errors(), true)); } ?> myquery: $idnumber = $_post["idnum"]; $response = array(); $query2 = "select clname, cfname, cmname, cqualifier student cidno = '$idnumber'"; try{ $stmt2 = sqlsrv_query($conn, $query2); } catch(pdoexeption $ex){ $response["success"] = 0; $response["message"] = "d...
Read more

php - trouble displaying mysqli database results in correct order -

i have table in database stores events , date expire. want display events on website display current events first expired events after? i have tried following sql $sql = "select noticeid, notice, noticedesc, noticeimg, noticedate, expirydate tbl_notices group noticeid ,expired order expirydate asc"; but returns expired results first due expirydate being ordered asc in query. my tbl_notice structure looks this noticeid => int(4) notice => varchar(100) noticedesc => text noticedate => timestamp noticeimg => varchar(40) expirydate => datetime expired => int(1) 0 current or 1 expired my php code is $sql = "select noticeid, notice, noticedesc, noticeimg, noticedate, expirydate tbl_notices group noticeid ,expired order expirydate asc"; $result = mysqli_query($conn,$sql); if ($result->num_rows > 0) { // output data of each row while($row = $result->fetch_assoc()) { ...
Read more

C++ Linked List -

i trying create linked list download txt file , use linked list handle file line line. when handling downloaded linked list operations performed on such text editor would. encountering problems however. seems "node(string value)" section of code has wrong though original node() declaration no arguments passes. unable figure out quite is. node.h class node { public: node(); node(string value); void setnext(node *nextnode); // allows user set "next" pointer of node points friend class linkedlist; private: string data; // data box node* next; // pointer box }; node.cpp # include <string> # include "node.h" using namespace std; node::node() { data = ""; next = null; } node::node(string value) { data = value; next = null; } void node::setnext(node *nextnode) // allows user set "next" pointer of node points { this->next = nextnode; } your #include <string> ...
Read more