On Thu, 24 Jul 2014 08:09:35 -0700 Thiago Macieira <[email protected]> said:
> On Thursday 24 July 2014 21:25:44 Bluezery wrote: > > I see. I am now a maintainer. :) > > > > But I got an error still > > > > remote: ERROR: missing Change-Id in commit message footer > > remote: Suggestion for commit message: > > remote: release: Switch back to development mode > > remote: > > remote: Open for 1.11 changes now. > > remote: > > remote: Change-Id: Iec62658686cd35a9c98dfe389d46d9723c671dc5 > > I think you need to push the commit directly to refs/heads/upstream, not to > refs/for. You're not reviewing the upstream. > > Once that is done, merge the commit to refs/heads/master, rebase > refs/heads/master on upstream or simply reset it to upstream. As the > maintainer, you have the right to make the choice of what is best for the > project and how the few changes we have in Gerrit will be re-applied, or not. there is a catch here - the update involved conflicts. that implies that there are changes in tizen git that have never been merged upstream. likely these will be all-out lost unless they are dug into in detail and evaluated (the conflicts themselves). gerrit didn't seem to provide any way to see the conflicts themselves (before fixing). the gerrit patch submitted for review would effectively be what happens next above - conflicts resolved by just squashing the src to a new upstream copy. so this needs resolving first i think (what are we about to squash/nuke and should it be kept?) -- Carsten Haitzler (The Rasterman) <[email protected]> _______________________________________________ Dev mailing list [email protected] https://lists.tizen.org/listinfo/dev
