[Pkg-protobuf-devel] Git workflow

[Iustin Pop]

On 2015-11-05 16:10:32, Andrew Pollock wrote:
> Hi,
> 
> Okay my next problem now is one of workflow. As the gRPC folks can attest,
> my Git-fu is weak. Couple that with the pkg-protobuf Git repository
> structure being completely differently structured to gRPC's, and I feel like
> a total fish out of water.
> 
> I've read
> http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.html,
> which didn't really help all that much.
> 
> What I want to do first of all is update the upstream source to what's
> tagged in the upstream repository with v3.0.0-beta-1
> 
> I want to keep this in a separate branch so if any modifications need to be
> made to the 2.6.1 packaging in the meantime, that's still a possibility.
> 
> I thought this could just be a case of making a new branch based off the
> current upstream branch, adding a new remote repository for upstream's
> github repo and then pulling the v3.0.0-beta-1 into this branch.
> 
> Something along the lines of:
> 
> git remote add realupstream https://github.com/google/protobuf.git
> git checkout -b upstream_v3.0.0-beta-1 upstream
> git pull realupstream v3.0.0-beta-1
> 
> But when I tried that, I got into a terrible mess with merge conflicts.
> Maybe that was the right thing to do, and I just don't know how to merge
> properly. Hopefully someone else here can provide some advice.

There seems to be something wrong with our current upstream branch. I
think the migration from .tar.gz to tracking upstream branch had issues.

E.g. if I checkout upstream/2.6.1 and try to merge it with v2.6.1 (from
realupstream), git says there are no changes to be done. However:

$ git diff --stat upstream/2.6.1..v2.6.1
… (lots of output cut)
 219 files changed, 990 insertions(+), 190552 deletions(-)

So our tree is not really upstream; many of the changes are files not
present in upstream git (but originally present in the tarball), but not
only; e.g. a lot of diffs in the vsprojects tree. I'm not surprised that
trying to merge to realupstream head is broken then, if real upstream
did more changes to the files which we had out-of-sync.

Looking at the git history, it looks like we do keep (and update) some
things which are expected normally in a tar.gz (e.g. Makefile.in), but
which upstream doesn't store in git; maybe Robert has some special steps
done when importing upstream sources?

That's about all I can dig right now…

regards,
iustin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-protobuf-devel/attachments/20151106/f48fa488/attachment.sig>