Re: [jokosher-devel] bad patch?

["Adam Reid" <atomic0x gmail com>]

Yep,

Sorry about that, I'm still learning.  It was just local stuff that
caused the problems.

Cheers,

Adam

On 10/30/06, Michael Sheldon <mike mikeasoft com> wrote:
> On Mon, Oct 30, 2006 at 08:30:49AM -0500, Laszlo Pandy wrote:
> > Adam Reid wrote:
> > > Hello All,
> > >
> > > I checked out rev 855 this morning and there was some problem with the
> > > patch that I sent out, because there were patch strings scattered
> > > throughout JokosherApp.py.
> >
> > I don't see the problem. Your last patch was committed and this new
> > patch just duplicates some things that are already committed.
>
> Hi Adam,
>
>  Chances are that there was a collision just with your local copy. See if there are files such as TimeLineBar.mine, TimeLineBar.r855, etc. these are created by svn when there is a collision and contain the different versions of the file. If there's nothing in your local copy you want to keep just delete TimeLineBar.* and run svn up again.
>
>  Cheers,
>   Mike.
>
> >
> > >
> > > Here is a diff.
> > >
> > > Adam
> > >
> > >
> > > ------------------------------------------------------------------------
> > >
> > > Index: Jokosher/TimeLineBar.py
> > > ===================================================================
> > > --- Jokosher/TimeLineBar.py (revision 855)
> > > +++ Jokosher/TimeLineBar.py (working copy)
> > > @@ -27,6 +27,8 @@
> > >             # add click / bpm / signature box
> > >             self.clickbutton = gtk.ToggleButton("C")
> > >             self.clicktip = gtk.Tooltips()
> > > +           self.clicktip.set_tip(self.clickbutton,_("Turn click track on"),None)
> > > +           self.clicktip = gtk.Tooltips()
> > >             self.clicktip.set_tip(self.clickbutton, _("Turn click track on"), None)
> >
> > See, both those lines are just duplicates of what came before/after it.
> > The only difference it that there is a space after the comma which I added.
> >
> > Laszlo
> > _______________________________________________
> > jokosher-devel-list mailing list
> > jokosher-devel-list gnome org
> > http://mail.gnome.org/mailman/listinfo/jokosher-devel-list
> >
>
> --
> Michael Sheldon
> http://www.mikeasoft.com
> _______________________________________________
> jokosher-devel-list mailing list
> jokosher-devel-list gnome org
> http://mail.gnome.org/mailman/listinfo/jokosher-devel-list