search for: patchbranch

...read the docs but everything seems to still require svn before bridging to github. I want to use git alone to commit a patch that I got reviewed. I currently have a local 'master' branch that I keep identical to the upstream branch. I also have another local branch (let's call it 'patchbranch' for the purposes of this question) where I committed the changes for the patch I want to push. I created the diff file by running git diff to compare my local 'master' with 'patchbranch’ branches and uploaded the file to Phabricator. I got the patch reviewed and I want to commit it...

...xample? Thanks, John > On 8 Nov 2019, at 17:25, Hiroshi Yamauchi <yamauchi at google.com> wrote: > > Here's roughly what I currently would do to commit a patch in a local branch (which I don't think involves svn): > > $ git branch --set-upstream-to=origin/master patchbranch # Make the branch track upstream master > $ git pull --rebase # Rebase patchbranch against upstream master > $ git llvm push # Commit > > > > > > On Fri, Nov 8, 2019 at 3:35 AM Joan Lluch via llvm-dev <llvm-dev at lists.llvm.org <mailto:llvm-dev at lists.llvm.org&...

...ote: > > No: the arcanist command does not suffer from the problem I was raising. > The issue I was referring to is that your reset command will lead to *undoing* changes from master (unrelated to your branch) when you commit in the end (all the changes that are in master but not in "patchbranch"). > (just try to add `git checkout master && git pull && git checkout tmp` before your `git reset `, and then look at the resulting commit). > But I would never do that!. The commands "git checkout master && git pull” are only run before the whole procedu...

Hi All, Ok, just for the matter of providing feedback that may be useful for others, I figured out one way to do it based on the setup that I described earlier. It can be something like this git checkout patchbranch # checkout to the patch branch, this is the one containing the differential patch code git checkout -b tmp # checkout to a new tmp branch git reset —soft master # set the tmp head to the master head without touching any files, so now the next commit will contain the delta fr...

...nd master, do this to pull in the changes neatly > Git push ## This will prompt you to provide github identity > >> >> I currently have a local 'master' branch that I keep identical to the upstream >> branch. I also have another local branch (let's call it 'patchbranch' for the >> purposes of this question) where I committed the changes for the patch I want >> to push. I created the diff file by running git diff to compare my local 'master' >> with 'patchbranch’ branches and uploaded the file to Phabricator. I got the >> pa...

> On 10 Nov 2019, at 07:00, Mehdi AMINI <joker.eph at gmail.com> wrote: > > recipe is not correct in the absolute: the delta from master does not mean it contains exactly what you want, you seem to assume that master didn't evolve between the time "patchbranch" was created. > Hi Mehdi, I’m doing it this way to make sure that master /actually/ contains “exactly what I want” (!). Of course the remote master could have evolved slightly during such steps, but that’s a cat-and-mouse game, that I don’t think that can be easily avoided (at least to m...