Rod <armyofthepenguin@xxxxxxxxx> writes:
> Here are the git commands Fred is attempting to use:
> # Branch the *base* of master
> git checkout -b updated_original_source_code 345678
>
> cp ../updated_source_code.tar.gz .
> tar zxvf updated_source_code.tar.gz
>
> # Commit all changes from original_source_code
> # to updated_source_code
> git -a -m "Updated original source code"
>
> # Now apply the history of master onto this branch:
> # This is where they get hosed because the timestamps
> # from Barney's commits are wrong, and hence the
> # generated patches are out of order.
> git format-patch 345678..master | git am -k -3
First of all, the branch name "updated_original_source_code" does not make
much sense. When you get another round of source tarball update, what
would you do? Create "updated_original_source_code_2"? The one after
that is "updated_original_source_code_3"?
That misses the whole point of revision control, doesn't it?
You instead keep an "upstream" branch, whose tip might be at 345678 before
accepting the tarball update, and you advance its tip only with the
upstream updates:
Barney o---o---o o---o
/ \ / \
Fred o---o---o---o---o---o---o---o---o---o
/
---o---------------------------------------o
^ ^
upstream ===== (tarball update) ======> upstream
You can tag its tip after every time you accept the tarball update from
your upstream.
A natural thing to do from there is to _merge_ upstream changes to your
shared development, that results in:
Barney o---o---o o---o
/ \ / \
Fred o---o---o---o---o---o---o---o---o---o---*
/ /
---o---------------------------------------o
^ ^
upstream ===== (tarball update) ======> upstream
Of course you could rebase all history on top of updated upstream (buy why
bother? -- you are not keeping a linear history by cross merging between
two developers already, so there is no point doing a "format-patch | am"
sequence to linearlize your history at this point), and --topo-order given
to format-patch may help with broken timestamps one of you recorded.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
