[Pkg-golang-commits] [SCM] Packaging for Google Go branch, debian-sid, updated. debian/2%1.0.1-1-48-gdad0456

[Michael Stapelberg]

The following commit has been merged in the debian-sid branch:
commit 39b34e75d2776044e6d771c808ddf5043db5a0fd
Merge: 75cafdb248f321775838731e79fbdc0db4ffdd1b efcc50dfdc94c82ee0292bf71992ecb7c0123061
Author: Michael Stapelberg <stapelberg at debian.org>
Date:   Tue May 14 18:49:42 2013 +0200

    Merge branch 'upstream-sid' into debian-sid
    
    Conflicts:
    	lib/codereview/codereview.py
    	lib/time/zoneinfo.zip
    	src/pkg/go/types/testdata/expr1.src
    	test/fixedbugs/issue5105.dir/a.go
    	test/fixedbugs/issue5260.dir/a.go
    
    In the end, I extracted go1.1.src.tar.gz and used cp -r /tmp/go/* .
    
    To be honest, I still don’t understand why git-import-orig yields merge
    errors at all or how that workflow is supposed to work. If someone could
    enlighten me, I’d be happy.


-- 
Packaging for Google Go