[dev] [commits] Horde-Hatchery branch ActiveSync updated. cc9c0cfd083b224741082301389822bc075e5e3c

[Michael Rubinsky]

Quoting Michael M Slusarz <slusarz at horde.org>:

> Quoting Michael Rubinsky <mike at theupstairsroom.com>:
>
>> The branch "ActiveSync" has been updated.
>> The following is a summary of the commits.
>>
>> from: 4129328a336e47d3a1aa0976f60da8c6feacf5b8
>>
>> 1376ce4 We only support one major version back.
>> 5b9ed9b Shout: ensure prototype.js is loaded
>> 2312df7 Shout: Remove dependency on lib/base.php
>> 905e0bf Shout: Continue working on AJAX destination edits
>> edaac82 Shout: tweak wording
>> cc9c0cf remove closing php tag
>
> This is a major issue with updating/rebasing a branch: it makes  
> these commit messages worthless.  I have no idea which of these  
> changes are exclusive to the ActiveSync branch and which changes are  
> the result of rebasing from master.  Until/unless someone can alter  
> the commit generation script to fix this, I think we need to avoid  
> rebasing/updating topic branches.

We were recently having some major discussion about this in IRC, and  
then also between Ben and I in email since we were both having issues  
with our topic branches. (Ben, can you forward my reply to your email  
to to dev@? I can't seem to find my Sent Mail copy). Personally, I  
think it's a major issue to not keep topic branches current.  I agree  
the _branch_ history can get muddled, but that is resolved once the  
topic branch is merged, then rebased with remote master. Yes, for some  
topic branches that are short-lived, this probably isn't an  
issue...but for branches that either introduce major changes, or are  
likely to be longer living, I think it's important to keep the  
branches in sync...especially if the idea is to have other people/devs  
want to try out the code, it should be the most recent code from  
master, with only the changes relevant to the topic.

In the past, when there were "important" fixes in code in master that  
were required to get code working in a topic branch, I've tried cherry  
picking only those commits and also have tried merging with master to  
get the commits. Both of these options have led to issues with  
conflicts when merging the topic branch back in, requiring me  
basically to step through each and every commit that has occured in  
master since the topic branch was created. Keeping them more or less  
in sync also makes it easier to deal with any conflicts that may arise  
since they would ben dealt with as they occur, instead of all at once  
when the branches are merged.

Of course, this is all IMHO ;)

Does anyone know of other major projects using Git, and what they do  
to handle this sort of thing?  I've seen projects with SVN that doe  
things like adding commits that basically just say "Syncing with  
trunk" or similar, but I don't think something like that is possible  
with the way git does things...maybe the answer lies somehere in our  
post-commit scripts?

Thanks,
mike

--
The Horde Project (www.horde.org)
mrubinsk at horde.org

"Time just hates me. That's why it made me an adult." - Josh Joplin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-keys
Size: 2200 bytes
Desc: PGP Public Key
URL: <http://lists.horde.org/archives/dev/attachments/20100106/b620aebc/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: PGP Digital Signature
URL: <http://lists.horde.org/archives/dev/attachments/20100106/b620aebc/attachment-0001.bin>