[FFmpeg-devel] Confusing git merges

[Michael Niedermayer]

On Sat, Mar 19, 2011 at 07:48:32PM +0000, David Woodhouse wrote:
> On Sat, 2011-03-19 at 20:32 +0100, Michael Niedermayer wrote:
> > Hi
> > 
> > I know alot of people have been confused seeing changes and then seeing them
> > reverted, or seeing changes on the ML that arent in the merged version
> > 
> > I really hate it as well, but this is how 'git pull' works
> > Unless we modify git or at least the mailing list hook these things will
> > keep showing up.
> > 
> > when theres a merge, the hook posts all changes of the merged branch no matter
> > if they are in the actual result or not.
> > 
> > i cant really do anything about it, except hacking the ML hook to filter it
> > out
> 
> If I understand the problem correctly, I think the generally accepted
> way to avoid it is: "Don't commit stuff and then revert it, in a tree
> that you're then going to offer for upstream merging".

i have no control over the tree i pull from

i agree with the remainder of your mail but it doesnt help due to above



[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Those who are too smart to engage in politics are punished by being
governed by those who are dumber. -- Plato 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20110319/3dd4d085/attachment-0001.asc>