archanaserver | vkmc: hi o/ | 07:24 |
---|---|---|
archanaserver | vkmc: can i work on different tasks in same branch? | 07:28 |
archanaserver | like i have already submitted patch for share group command and it's in review state | 07:29 |
archanaserver | so i'm starting working on share group snapshot on the same branch(as all osc patches are in the same branch) | 07:29 |
archanaserver | vkmc, my question is how the another task implementation will create diff patch in gerrit when the code will be in the same branch | 07:32 |
archanaserver | vkmc, ah! i forget you are on off this week :/ | 07:42 |
archanaserver | gouthamr, hi o/ can you help me with this? | 07:42 |
kafilat | archanaserver: o/ | 08:33 |
kafilat | git checkout -b BRANCHNAME origin/master | 08:34 |
archanaserver | kafilat: o/ thanks :) | 08:37 |
kafilat | ;) | 08:38 |
gouthamr | archanaserver: i presume you want on top of your share groups change so you can use the share groups code | 16:25 |
gouthamr | gerrit treats each individual commit as a different change - you'll see the git-review tool make up a different change id for each commit | 16:25 |
archanaserver | gouthamr: here -> https://review.opendev.org/q/topic:%22bp%252Fopenstack-client-support%22+(status:open%20OR%20status:merged) all the patches are on the same branch and similarly i have created one in my local env and submitted a patch for share group | 17:23 |
archanaserver | now, i want to start working on another command (ex: share group snapshot) so how we differentiate codes for all the patches? | 17:23 |
archanaserver | gouthamr: i hope i'm asking this in a right way | 17:24 |
gouthamr | archanaserver: trying to understand - your branch name locally is bp/openstack-client-support? | 17:24 |
archanaserver | gouthamr: yes | 17:24 |
gouthamr | archanaserver: okay, if i can suggest a different approach - local and remote branches don't have to match | 17:25 |
gouthamr | archanaserver: for example, whatever the branch is locally, the code gets submitted against a specific branch upstream - master in this case | 17:25 |
gouthamr | archanaserver: what you're seeing in the braces there is a branch "topic" - a gerrit concept | 17:26 |
gouthamr | archanaserver: you can set the topic via your "git review" command | 17:26 |
gouthamr | archanaserver: so, from whatever local branch, you can do "git review -t bp/openstack-client-support" | 17:26 |
gouthamr | archanaserver: this will upload your local changes to whatever default branch and set the topic to "bp/openstack-client-support" | 17:27 |
gouthamr | archanaserver: if you want to upload code to a particular branch, that branch must exist on gerrit - and we don't have any feature branches; our branches are "master" and "stable/*" branches - named after releases | 17:27 |
gouthamr | archanaserver: so for example if you want to submit your code to the stable/ussuri branch - you would do "git review stable/ussuri -t "my-change-or-branch-topic") | 17:28 |
gouthamr | s/)// | 17:28 |
archanaserver | gouthamr: okay, now my confusion is clear | 17:33 |
archanaserver | gouthamr: thanks :) | 17:34 |
gouthamr | you're welcome archanaserver | 17:34 |
*** ChanServ changes topic to "Welcome to Outreachy OpenStack!" | 22:55 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!