[gst-devel] [gst-cvs] gst-python: Merge branch 'bz-577735'

[Thomas Vander Stichele]

On Thu, 2009-04-16 at 00:42 +0200, Edward Hervey wrote:
> Thomas,
> 
>   You were already told off once about merges. You now do a
> double-merge... of a one commit branch.

Your advice will go down better if you stop pretending you're a parent
talking to a child.  Especially if you do it in public.

I don't know why you think it's a one commit branch, it wasn't.  The
commit is squashed.


>   Please, CHECK CHECK CHECK and CHECK before pushing (use a graphical
> tool like giggle) that you're not doing a non-fast-forward merge (you
> shouldn't see any branches in giggle before pushing but only a straight
> line), especially when you are not familiar with git.

I did exactly that, asking for help as I did so to thaytan and ds.
Thaytan said on IRC that the commit looked fine to him.  AFAICT the
commit looks like a single commit; the URL shows it as such.  Feel free
to explain to me how I can see from that URL that I did it wrong.

By the way, I did *exactly* what you said in your last 'telling off'
mail:

  * git rebase master
  * git checkout master
  * git merge whatever

So if something is missing from this list, feel free to let me know, and
document it somewhere publically so people have something to look at
when they are really trying to do the right thing.

Constructive feedback is welcome.

Thomas



>    Edward
> 
> On Wed, 2009-04-15 at 13:43 -0700, Thomas Vander Stichele wrote:
> > Module: gst-python
> > Branch: master
> > Commit: 62d82ad5b64974dc2be8b9684716c2144c3c9371
> > URL:    http://cgit.freedesktop.org/gstreamer/gst-python/commit/?id=62d82ad5b64974dc2be8b9684716c2144c3c9371
> > 
> > Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
> > Date:   Wed Apr 15 22:38:28 2009 +0200
> > 
> > Merge branch 'bz-577735'
> > 
> > ---
> > 
> > 
> > 
> > 
> > ------------------------------------------------------------------------------
> > This SF.net email is sponsored by:
> > High Quality Requirements in a Collaborative Environment.
> > Download a free trial of Rational Requirements Composer Now!
> > http://p.sf.net/sfu/www-ibm-com
> > _______________________________________________
> > gstreamer-cvs mailing list
> > gstreamer-cvs at lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs
> 

-- 
Being hung over is like winning the lottery, except they pay you in
regret!
--
GStreamer - bringing multimedia to your desktop
http://gstreamer.freedesktop.org/