{"thread":{"id":"7749","subject":"StGit: Notice: no parent remote declared for stack","startedAt":"2007-04-20T05:20:49Z","lastAt":"2007-05-11T20:47:58Z","messageCount":2,"participants":["Rajkumar S","Yann Dirson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"39939","messageId":"64de5c8b0704192220j6f5f9493md91a33f537ebb25@mail.gmail.com","threadId":"7749","inReplyTo":null,"subject":"StGit: Notice: no parent remote declared for stack","fromName":"Rajkumar S","fromEmail":"rajkumars@gmail.com","sentAt":"2007-04-20T05:20:49Z","receivedAt":"2007-04-20T05:20:49Z","isPatch":false,"sender":{"key":"rajkumars@gmail.com","avatar":null},"body":"Hi,\n\nI am following another git repository with StGit. In the remote\nrepository I am following RELENG_1_2 branch.\n\nI created the StGit repository using stg clone and then changed to\nRELENG_1_2 branch and did a stg init and edited the\n.git/remotes/origin to\n\nURL: /usr/local/upstream/.git\nPull: refs/heads/RELENG_1_2:refs/heads/RELENG_1_2\n\nWhen I do an stg pull I get the following error:\n\nNotice: no parent remote declared for stack \"RELENG_1_2\", defaulting\nto \"origin\". Consider setting \"branch.RELENG_1_2.remote\" and\n\"branch.RELENG_1_2.merge\" with \"git repo-config\".\n\nWhat should I set branch.RELENG_1_2.remote and branch.RELENG_1_2.merge\nto ? a sample command would be very helpful as I am not very much upto\nspeed with git repo-config\n\nraj\n"},{"id":"41859","messageId":"20070511204758.GI19253@nan92-1-81-57-214-146.fbx.proxad.net","threadId":"7749","inReplyTo":"64de5c8b0704192220j6f5f9493md91a33f537ebb25@mail.gmail.com","subject":"Re: StGit: Notice: no parent remote declared for stack","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2007-05-11T20:47:58Z","receivedAt":"2007-05-11T20:47:58Z","isPatch":false,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"Sorry for the late answer - this mail has been stagnating in my\n\"postponed folder\".\n\nOn Fri, Apr 20, 2007 at 10:50:49AM +0530, Rajkumar S wrote:\n> I am following another git repository with StGit. In the remote\n> repository I am following RELENG_1_2 branch.\n> \n> I created the StGit repository using stg clone and then changed to\n> RELENG_1_2 branch and did a stg init and edited the\n> git/remotes/origin to\n> \n> URL: /usr/local/upstream/.git\n> Pull: refs/heads/RELENG_1_2:refs/heads/RELENG_1_2\n\nYou are not using git 1.5, are you ?  1.5 uses the new separate-remote\nlayout, which should setup something similar for you.\n\n> \n> When I do an stg pull I get the following error:\n> \n> Notice: no parent remote declared for stack \"RELENG_1_2\", defaulting\n> to \"origin\". Consider setting \"branch.RELENG_1_2.remote\" and\n> \"branch.RELENG_1_2.merge\" with \"git repo-config\".\n> \n> What should I set branch.RELENG_1_2.remote and branch.RELENG_1_2.merge\n> to ?\n\nIt will tell git-pull from which remote repository and branch to pull.\nIn your case, the default remote \"origin\", is correct, but stgit (and\ngit) cannot guess the branch to merge from.\n\n\n> a sample command would be very helpful as I am not very much upto\n> speed with git repo-config\n\nIf you have cloned this repo to work on it, I suppose what you want is\na patch stack that branches off the remote RELENG_1_2 branch.\ngit-clone will have already mirrored it locally to\nremotes/origin/RELENG_1_2, so you don't need to edit the remote\ndefinition to add it under refs/heads.\n\nHere is an example, the conf for my main stgit branch, forked off\nCatalin's master branch.  Note that \"branch.master.merge\" refers to\nthe head in the remote repository, not to where it is stored locally.\nAlso note that branch.master.stgit.pull-policy is only honored by the\ndevelopment version of stgit (ie. not 1.12.x).\n\n[remote \"origin\"]\n        url = http://homepage.ntlworld.com/cmarinas/stgit.git\n        fetch = refs/heads/*:refs/remotes/origin/*\n[branch \"master\"]\n        remote = origin\n        merge = refs/heads/master\n[branch \"master.stgit\"]\n        pull-policy = fetch-rebase\n\nBest regards,\n-- \nYann.\n"}]}