Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [paho-dev] Creating a new branch in git
It was surprisingly easy... although a quite bit more convoluted and putting a lot of faith in following a series of git commands you're certain to forget the next time around. Definitely something to get properly documented in our CONTRIBUTING.md files ;)

And it does support submitting changes based on a branch.

One word of warning... if you have multiple commits to push, each one will result in a change to be reviewed in gerrit. A good lesson in squashing commits before submitting (apologies to anyone who got spammed by my first attempt at this).

But anyway, here you go: https://git.eclipse.org/r/#/c/21428/

One general question then - does this mean everything we do has to be reviewed, or can we self-review changes? (Leaving aside the rights/wrongs of self-reviewing).
N




On 1 February 2014 17:32, Andy Piper <andypiperuk@xxxxxxxxx> wrote:
Hmm, joy, yes, Gerrit change was made - not sure of the impact on branching etc :-/


On Sat, Feb 1, 2014 at 5:30 PM, David M Williams <david_williams@xxxxxxxxxx> wrote:
Well ... you have pretty much exhausted my Git knowledge. Might have to get web master help.

But, I can suggest one other thing. The way you describe it ... you "renamed your branch" .... sounds like there might be some "history" there, that has a permeant branch name? You might try "starting fresh" with one test file, and if that works, copy others there.

Oh, wait ... I just looked on file system, and looks like you are set up to do "Gerrit only" commits? I think I did hear for that case, you do have to open a bug and ask web master for help creating branches OR ... ask a Gerrit expert ... might be possible, but I'm not that familiar with Gerrit.

Good luck,




From:        "Nicholas O'Leary" <nick.oleary@xxxxxxxxx>
To:        General development discussions for paho project <paho-dev@xxxxxxxxxxx>,
Date:        02/01/2014 11:01 AM
Subject:        Re: [paho-dev] Creating a new branch in git
Sent by:        paho-dev-bounces@xxxxxxxxxxx



Hi David,

that makes sense - although it isn't working for me having renamed my branch 'noleary/develop':

nol@noltop:~/code/projects/paho/org.eclipse.paho.mqtt._javascript_ (noleary/develop)$ git push origin noleary/develop
Counting objects: 26, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (20/20), done.
Writing objects: 100% (22/22), 27.69 KiB, done.
Total 22 (delta 7), reused 0 (delta 0)
error: insufficient permission for adding an object to repository database ./objects

fatal: failed to write object
error: unpack failed: unpack-objects abnormal exit
To ssh://git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt._javascript_.git
 ! [remote rejected] noleary/develop -> noleary/develop (n/a (unpacker error))
error: failed to push some refs to 'ssh://git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt._javascript_.git'
nol@noltop:~/code/projects/paho/org.eclipse.paho.mqtt._javascript_ (noleary/develop)$ 






On 1 February 2014 15:13, David M Williams <david_williams@xxxxxxxxxx> wrote:
By policy, most repositories are set up so it takes special action or web master assistance to create a new "permeant" branch ... BUT, any committer can create a new "topic branch" ... the format of the name just needs to be committerId/topic ... so, perhaps "nick/develop" will work for you? (The reason for this is that "permeant branches" should never be deleted, hence it is made "harder" to create them ... whereas if you create a topic branch with your committer ID as part of the name, then the system will not only allow you to create it, but you can delete it later).





From:        "Nicholas O'Leary" <nick.oleary@xxxxxxxxx>
To:        General development discussions for paho project <paho-dev@xxxxxxxxxxx>,
Date:        02/01/2014 09:05 AM
Subject:        [paho-dev] Creating a new branch in git
Sent by:        paho-dev-bounces@xxxxxxxxxxx




Hi,

I've been poking at the structure of the _javascript_ client project to get back to the point where the .js file in git can actually be used without running it through a maven build. This involved adding a very small wrapper for the node-based tests to use so the client can still use the browser-specific apis.

I've also added a _javascript_ compress task to the build so we have a -min.js version (30Kb)  as well as the original one (76kb).

I wanted to push this to a new branch (nick-develop) so that anyone with an interest could have a look to make sure we're happy for it to go into the main develop branch. However, when I try to push the new branch, I'm told I don't have the right permissions:

    error: insufficient permission for adding an object to repository database ./objects
    
    fatal: failed to write object
    error: unpack failed: unpack-objects abnormal exit
    To ssh://git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt._javascript_.git
     ! [remote rejected] nick-develop -> nick-develop (n/a (unpacker error))
    error: failed to push some refs to 'ssh://git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt._javascript_.git'


Does creating a new branch really need more permissions than I have as a committer?  If so, what is the expected work flow for this sort of thing? (I suspect I'm too used to the github work flow where this is second nature...)

Nick



_______________________________________________
paho-dev mailing list
paho-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/paho-dev


_______________________________________________
paho-dev mailing list
paho-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/paho-dev
_______________________________________________
paho-dev mailing list
paho-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/paho-dev

_______________________________________________
paho-dev mailing list
paho-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/paho-dev




--
Andy Piper | Kingston upon Thames, London (UK)
blog: http://andypiper.co.uk   |   skype: andypiperuk
twitter: @andypiper  |  images: http://www.flickr.com/photos/andypiper

_______________________________________________
paho-dev mailing list
paho-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/paho-dev


Back to the top