incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Schaefer <joe_schae...@yahoo.com>
Subject Re: [PATCH] Corrected two typos on website
Date Fri, 24 Jun 2011 18:47:02 GMT
Locking is not high on the list of collaborative activities
at Apache.  The proper workflow is to run svn up, apply the patch,
then commit it.  If the commit fails, run svn up and svn diff
to see what's changed on the server in the interim (fwiw the CMS
webgui does this automatically).  If you have no conflicts to
deal with and like the diff, then recommit.




----- Original Message ----
> From: Rob Weir <apache@robweir.com>
> To: ooo-dev@incubator.apache.org
> Sent: Fri, June 24, 2011 2:41:15 PM
> Subject: Re: [PATCH] Corrected two typos on website
> 
> How?  By locking the files that are being patched while doing  the
> review?  Would that have really told the 2nd reviewer  anything?
> Locking only prevents me from committing by working copy.  It  doesn't
> prevent me from applying a patch to my working copy,  right?
> 
> -Rob
> 
> On Fri, Jun 24, 2011 at 2:31 PM, Joe Schaefer <joe_schaefer@yahoo.com>  wrote:
> > Better to let subversion resolve coordination problems than to  put up 
>obstructions to jfdi, IMO.
> >
> > Sent from my  iPhone
> >
> > On Jun 24, 2011, at 2:26 PM, Rob Weir <apache@robweir.com>  wrote:
> >
> > Good job, both.
> >
> > My little mystery was  trying to figure out why SVN was not letting me
> > apply the patch.  Then I  figured it out.  The patch had already been
> > applied. ;-)
> >
> >  Perhaps a convention in the future would be that the committer who
> > wants  to review and merge a patch first "claims" the patch on the
> > list, by  responding to the [PATCH] note, saying "I have this one" or
> > something  equivalent.
> >
> > -Rob
> >
> > On Fri, Jun 24, 2011 at 2:20  PM, Dick Groskamp <th.groskamp@quicknet.nl>
 
>wrote:
> > Op 24-6-2011 20:18, Marcus (OOo) schreef:
> >
> > Thanks  for the fix. :-)
> >
> > As I don't know yet how to add a patch to SVN,  I've corrected the text
> > directly. I hope it's OK for you. Of course I've  mentioned you in the 
commit
> > message.
> >
> >  Marcus
> >
> > No problem. Just stumbled over them when I was playing  with SVN.
> > (I'm also on the learning curve like yourself I presume  ;-)  )
> >
> > --
> > DiGro
> >
> > Windows 7 and OpenOffice.org 3.3
> >  Scanned with Ziggo uitgebreide Internetbeveiliging  (F-Secure)
> >
> >
> >
> >
> 

Mime
View raw message