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
== running git checkout 7.2
Already on '7.2'
== ghc-tarballs: running git checkout 7.2
Already on '7.2'
== utils/hsc2hs: running git checkout 7.2
.....
desire:ghc-head benl$ git branch
* 7.2
master
desire:ghc-head benl$ ./sync-all pull
== 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. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
If you often merge with the same branch, you may want to
use something like the following in your configuration file:
[branch "7.2"]
remote = <nickname>
merge = <remote-ref>
[remote "<nickname>"]
url = <url>
fetch = <refspec>
See git-config(1) for details.
git failed: 256 at ./sync-all line 145.
??? I don't understand what to do here.
desire:ghc-head benl$ cd libraries/integer-gmp/
desire:integer-gmp benl$ 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. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.
If you often merge with the same branch, you may want to
use something like the following in your configuration file:
[branch "7.2"]
remote = <nickname>
merge = <remote-ref>
[remote "<nickname>"]
url = <url>
fetch = <refspec>
See git-config(1) for details.
???
desire:integer-gmp benl$ git fetch
[nothing happens]
desire:integer-gmp benl$ git merge origin
Already up-to-date.
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?
If someone can explain it to me I'll update the GHC wiki with that new
information.
Thanks
Ben.
_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc
