On 4 August 2011 09:06, Ben Lippmeier <[email protected]> wrote: > > All, > Can someone please explain how to pull patches into the GHC trees when you've > got branches? I was following the instructions on the GHC wiki. I've got the > 7.2 branch but I can't work out how to pull new patches into it. > > > desire:ghc-head benl$ ./sync-all checkout 7.2
Is this really the 7.2 branch? The branch is called ghc-7.2, not just 7.2. > == running git pull > You asked me to pull without telling me which branch you > want to merge with, and 'branch.7.2.merge' in > your configuration file does not tell me, either. This indicates that 7.2 is not set up to track the upstream origin/ghc-7.2 branch. You can work around by doing "./sync-all pull origin ghc-7.2". Or you can set up your 7.2 branches to track the upstream ghc-7.2 branches, see here: http://stackoverflow.com/questions/520650/how-do-you-make-an-existing-git-branch-track-a-remote-branch > It says "up-to-date", but 'git log' doesn't reveal all the patches that I > know are in the 7.2 branch on darcs.haskell.org. My vague understanding of > git is that you "fetch" patches, but they remain unapplied until they're > merged with the branch. How do I see which patches have been fetched but not > merged? How do I then merge those patches with the 7.2 branch? Off the top of my head: To see fetched patches: git log origin/ghc-7.2 To see unmerged patches: git log origin..origin/ghc-7.2 To merge them to your local 7.2 branch: git checkout 7.2 && git merge origin/ghc-7.2 Does that help? Max _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
