[FFmpeg-devel] Confusing git merges

[Michael Niedermayer]

On Sat, Mar 19, 2011 at 11:16:21PM +0100, Reimar Döffinger wrote:
> On 19 Mar 2011, at 22:24, Michael Niedermayer <michaelni at gmx.at> wrote:
> > 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
> 
> Would it be possible to somehow pull through an intermediate (local) repository or something like that?

Well having a local repo and cleaning  their stuff up before pulling means work
and git would only know it merged the local repo it wouldnt
know about the remote ..
Thats not looking very convenient to me.


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

Asymptotically faster algorithms should always be preferred if you have
asymptotical amounts of data
-------------- 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/20110320/97047ea3/attachment-0001.asc>