Merging repositories

[Michael Alexeev]

Hi All,

I need to bring my local fork up-to-date with the main repository. Is it that the right sequence of commands for that:

git fetch upstream
git merge upstream/master

where upstream points to https://github.com/VoltDB/voltdb.git and master is my local repository https://github.com/alexeevm/voltdb

Thanks,
Mike

[Ryan Betts]

Yes. Assuming are running these commands with your local master checked out. So:

> git checkout master

> git fetch upstream
> git merge upstream/master

Ryan.

[Michael Alexeev]

Thanks Ryan. If I also have pullexec local branch it would probably make sense to merge it with the upstream first
 git checkout pullexec
 git fetch upstream
 git merge upstream/pullexec

and then merge my master and the pullexec branches, right?
Mike

[Ryan Betts]

On Sat, Jun 16, 2012 at 9:27 AM, Michael Alexeev
<michael...@gmail.com> wrote:
> Thanks Ryan. If I also have pullexec local branch it would probably make
> sense to merge it with the upstream first
>  git checkout pullexec
>  git fetch upstream
>  git merge upstream/pullexec
>
> and then merge my master and the pullexec branches, right?

That would merge (Paul's?) changes on upstream/pullexec with your
local pullexec branch.

"git fetch upstream" will fetch all the upstream content. (Branches
are really just pointers into the repository's content graph.) You can
fetch once and then merge whatever series of branches makes sense.

Ryan.

[Michael Alexeev]

Thanks Ryan.

[Paul Martel]

Mike,
  fyi, the pullexec271 branch contains a raw not-quite-compiling merge of a recent-ish master onto pullexec.
If you have already tried this merge, you should have gotten similar results -- though yours will be slightly more up-to-date.
I made the new branch to keep the original VoltDB/voltdb:pullexec as a staging area for incoming changes from your fork, not
complicated by changes from master that you haven't brought to your fork, yet.
Long term, I'd expect a successful merge to make a full round trip back to VoltDB/voltdb:master to alexeevm/voltdb:master to alexeevm/voltdb:pullexec to VoltDB/voltdb:pullexec.

I find that temporary side-branches like pullexec271 help me to keep things straight when I am experimenting with merges and other things that can go wrong.

--paul

[Michael Alexeev]

Paul, I haven't started the merge yet but my plan was actually to follow your long term path: VoltDB/master -> alexeevm/master -> alexeevm:pullexec. Is there a way you can send me the list of files you already merged/started merging? I will simply get them from the pullexec271 branch and put them to my branch manually.

Mike

[Paul Martel]

https://github.com/VoltDB/voltdb/commit/1be079163ad7f03a2da611b79389ec8f92b390f9 has the list of files/changes from the merge.
In the morning I'll take a quick look at how I resolved the compile issues and possibly get something that might be usable except for not passing the new index key overflow/underflow unit tests -- which I suppose we could disable for now.

The full set of master changes added to pullexec can be seen in the

Pullexec271

pull request I added from pullexec271 to pullexec.