How to use SVN

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

How to use SVN

DS Blank
Rob (and others getting started with svn),

First, thanks for your continued work on NarWeb!

But, there are too many changes in:

http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15258&r2=15257&pathrev=15258

You need to break up each change to fix one particular thing. Some of
your changes have broken things that were working yesterday, and this
is too close to a release to go back and try to find what change
caused the issue.

Also, you should not introduce new features into any maintenance
branch---unless you have a very good reason to, and have discussed
this on the mailing list.

Revision control is designed so that you can examine changes that
introduce regressions, and easily revert if necessary. But such a
monolithic set of changes makes that impossible.

If you would, please go back to the revision before, and apply your
changes one fix at a time. For example, here is a patch that does one
thing:

http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15219&r2=15221&pathrev=15258

I see at least one error in showing regions in a thumbnail, but I
haven't even begun to test all of the changes that you made. You want
to be able to guarantee that every change that you made will not break
anything. Of course, you can't be 100% sure (no one can) but you need
to be as certain as one possibly can, and one way to do that is to
make just a few surgical changes, and put each one in a different
patch, either linking to the issue tracker, or provide a description
of what it fixes. And test, test, test, test...

Hope that helps!

-Doug

------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: How to use SVN

jerome
> But, there are too many changes in:
>
> http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15258&r2=15257&pathrev=15258
>

Also, does changes on WebCal not break up a previous fix ?

http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/WebCal.py?r1=15258&r2=15257&pathrev=15258
http://www.gramps-project.org/bugs/view.php?id=3734



Doug Blank a écrit :

> Rob (and others getting started with svn),
>
> First, thanks for your continued work on NarWeb!
>
> But, there are too many changes in:
>
> http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15258&r2=15257&pathrev=15258
>
> You need to break up each change to fix one particular thing. Some of
> your changes have broken things that were working yesterday, and this
> is too close to a release to go back and try to find what change
> caused the issue.
>
> Also, you should not introduce new features into any maintenance
> branch---unless you have a very good reason to, and have discussed
> this on the mailing list.
>
> Revision control is designed so that you can examine changes that
> introduce regressions, and easily revert if necessary. But such a
> monolithic set of changes makes that impossible.
>
> If you would, please go back to the revision before, and apply your
> changes one fix at a time. For example, here is a patch that does one
> thing:
>
> http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15219&r2=15221&pathrev=15258
>
> I see at least one error in showing regions in a thumbnail, but I
> haven't even begun to test all of the changes that you made. You want
> to be able to guarantee that every change that you made will not break
> anything. Of course, you can't be 100% sure (no one can) but you need
> to be as certain as one possibly can, and one way to do that is to
> make just a few surgical changes, and put each one in a different
> patch, either linking to the issue tracker, or provide a description
> of what it fixes. And test, test, test, test...
>
> Hope that helps!
>
> -Doug
>
> ------------------------------------------------------------------------------
> _______________________________________________
> Gramps-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/gramps-devel
>


------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: How to use SVN

Benny Malengier
In reply to this post by DS Blank
Rob,

you have really completely broken narweb with this commit. It does not even work anymore on python 2.5. You also changed copyright notice of other people, you should never do that!

I reverted it for you:

svn diff -r 15258:15257 > revert15258.diff
patch -p0 < revert15258.diff
commit

Don't change anything in 3.2 anymore without knowing
1. it is a bug fix, not a feature
2. it is tested, tested, tested. 3.2 is our stable release.

Also for trunk you should revert the change, and apply smaller patches.

Benny

2010/4/22 Doug Blank <[hidden email]>
Rob (and others getting started with svn),

First, thanks for your continued work on NarWeb!

But, there are too many changes in:

http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15258&r2=15257&pathrev=15258

You need to break up each change to fix one particular thing. Some of
your changes have broken things that were working yesterday, and this
is too close to a release to go back and try to find what change
caused the issue.

Also, you should not introduce new features into any maintenance
branch---unless you have a very good reason to, and have discussed
this on the mailing list.

Revision control is designed so that you can examine changes that
introduce regressions, and easily revert if necessary. But such a
monolithic set of changes makes that impossible.

If you would, please go back to the revision before, and apply your
changes one fix at a time. For example, here is a patch that does one
thing:

http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15219&r2=15221&pathrev=15258

I see at least one error in showing regions in a thumbnail, but I
haven't even begun to test all of the changes that you made. You want
to be able to guarantee that every change that you made will not break
anything. Of course, you can't be 100% sure (no one can) but you need
to be as certain as one possibly can, and one way to do that is to
make just a few surgical changes, and put each one in a different
patch, either linking to the issue tracker, or provide a description
of what it fixes. And test, test, test, test...

Hope that helps!

-Doug

------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel


------------------------------------------------------------------------------

_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: How to use SVN

jerome
In reply to this post by jerome
I see some clean-up done by Rob :

NarrativeWeb
-log = logging.getLogger(".WebPage")
+log = logging.getLogger(".NarrativeWeb")

WebCal
* twice "from DateHandler import displayer as _dd"

* from Utils import probably_alive, xml_lang, get_researcher
   import Utils


but also some new translation strings :-\

_("Sub Navigation Menu Item: ")
_("Main Navigation Menu Item: %s")
_('The stylesheet to be used for the web pages')



Jérôme



Jérôme a écrit :

>> But, there are too many changes in:
>>
>> http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15258&r2=15257&pathrev=15258
>>
>
> Also, does changes on WebCal not break up a previous fix ?
>
> http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/WebCal.py?r1=15258&r2=15257&pathrev=15258
> http://www.gramps-project.org/bugs/view.php?id=3734
>
>
>
> Doug Blank a écrit :
>> Rob (and others getting started with svn),
>>
>> First, thanks for your continued work on NarWeb!
>>
>> But, there are too many changes in:
>>
>> http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15258&r2=15257&pathrev=15258
>>
>> You need to break up each change to fix one particular thing. Some of
>> your changes have broken things that were working yesterday, and this
>> is too close to a release to go back and try to find what change
>> caused the issue.
>>
>> Also, you should not introduce new features into any maintenance
>> branch---unless you have a very good reason to, and have discussed
>> this on the mailing list.
>>
>> Revision control is designed so that you can examine changes that
>> introduce regressions, and easily revert if necessary. But such a
>> monolithic set of changes makes that impossible.
>>
>> If you would, please go back to the revision before, and apply your
>> changes one fix at a time. For example, here is a patch that does one
>> thing:
>>
>> http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15219&r2=15221&pathrev=15258
>>
>> I see at least one error in showing regions in a thumbnail, but I
>> haven't even begun to test all of the changes that you made. You want
>> to be able to guarantee that every change that you made will not break
>> anything. Of course, you can't be 100% sure (no one can) but you need
>> to be as certain as one possibly can, and one way to do that is to
>> make just a few surgical changes, and put each one in a different
>> patch, either linking to the issue tracker, or provide a description
>> of what it fixes. And test, test, test, test...
>>
>> Hope that helps!
>>
>> -Doug
>>
>> ------------------------------------------------------------------------------
>> _______________________________________________
>> Gramps-devel mailing list
>> [hidden email]
>> https://lists.sourceforge.net/lists/listinfo/gramps-devel
>>
>
>
> ------------------------------------------------------------------------------
> _______________________________________________
> Gramps-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/gramps-devel


------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: How to use SVN

Stéphane Charette-2
In reply to this post by DS Blank
This is not good.  I began working on the 3.2.1 release earlier
tonight as I happen to have an evening where I could break free from
work for a few hours.  Didn't know things had just recently been
broken.

I just sent the announcement out, and now I see this e-mail thread...  <sigh>

Let me know if we're going to need a quick fix.  It is nearing 2am, I
need to get to bed.  I'll look for e-mail updates tomorrow before
work.

Stéphane


On Wed, Apr 21, 2010 at 23:31, Doug Blank <[hidden email]> wrote:

> Rob (and others getting started with svn),
>
> First, thanks for your continued work on NarWeb!
>
> But, there are too many changes in:
>
> http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15258&r2=15257&pathrev=15258
>
> You need to break up each change to fix one particular thing. Some of
> your changes have broken things that were working yesterday, and this
> is too close to a release to go back and try to find what change
> caused the issue.
>
> Also, you should not introduce new features into any maintenance
> branch---unless you have a very good reason to, and have discussed
> this on the mailing list.
>
> Revision control is designed so that you can examine changes that
> introduce regressions, and easily revert if necessary. But such a
> monolithic set of changes makes that impossible.
>
> If you would, please go back to the revision before, and apply your
> changes one fix at a time. For example, here is a patch that does one
> thing:
>
> http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15219&r2=15221&pathrev=15258
>
> I see at least one error in showing regions in a thumbnail, but I
> haven't even begun to test all of the changes that you made. You want
> to be able to guarantee that every change that you made will not break
> anything. Of course, you can't be 100% sure (no one can) but you need
> to be as certain as one possibly can, and one way to do that is to
> make just a few surgical changes, and put each one in a different
> patch, either linking to the issue tracker, or provide a description
> of what it fixes. And test, test, test, test...
>
> Hope that helps!
>
> -Doug
>
> ------------------------------------------------------------------------------
> _______________________________________________
> Gramps-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/gramps-devel
>

------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: How to use SVN

Benny Malengier


2010/4/22 Stéphane Charette <[hidden email]>
This is not good.  I began working on the 3.2.1 release earlier
tonight as I happen to have an evening where I could break free from
work for a few hours.  Didn't know things had just recently been
broken.

Don't blame yourself. I should have mailed the list the release was imminent, Doug should have reverted when he saw it then mail Rob and the list, Rob should never have committed it, ... We can pass blame around for a long time.
 

I just sent the announcement out, and now I see this e-mail thread...  <sigh>

Let me know if we're going to need a quick fix.  It is nearing 2am, I
need to get to bed.  I'll look for e-mail updates tomorrow before
work.

Ok, and many thanks for the release!

Yes, the commit of Rob is inside 3.2.1:
http://gramps.svn.sourceforge.net/viewvc/gramps/tags/gramps-3.2.1/src/plugins/webreport/NarrativeWeb.py?view=log
You made the tag on 9:12, I reverted the change on 9:28. Close.

Doug, as you started this thread, is a quick new release 3.2.2 needed without commit? 
What I know now:

1. in python 2.5, nar web will probably not even load, if it loads, then it will crash on run (with statement import from future is removed)

2. you mention a bug in image regions. Is it serious?

For 1., not many people are still running python 2.5, and if they do, they probably can only upgrade if they do it manually, so obtaining last narweb from repo and overwriting the install, should not be difficult for those users (but annoying). So that can wait some.

Benny



Stéphane


On Wed, Apr 21, 2010 at 23:31, Doug Blank <[hidden email]> wrote:
> Rob (and others getting started with svn),
>
> First, thanks for your continued work on NarWeb!
>
> But, there are too many changes in:
>
> http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15258&r2=15257&pathrev=15258
>
> You need to break up each change to fix one particular thing. Some of
> your changes have broken things that were working yesterday, and this
> is too close to a release to go back and try to find what change
> caused the issue.
>
> Also, you should not introduce new features into any maintenance
> branch---unless you have a very good reason to, and have discussed
> this on the mailing list.
>
> Revision control is designed so that you can examine changes that
> introduce regressions, and easily revert if necessary. But such a
> monolithic set of changes makes that impossible.
>
> If you would, please go back to the revision before, and apply your
> changes one fix at a time. For example, here is a patch that does one
> thing:
>
> http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gramps32/src/plugins/webreport/NarrativeWeb.py?r1=15219&r2=15221&pathrev=15258
>
> I see at least one error in showing regions in a thumbnail, but I
> haven't even begun to test all of the changes that you made. You want
> to be able to guarantee that every change that you made will not break
> anything. Of course, you can't be 100% sure (no one can) but you need
> to be as certain as one possibly can, and one way to do that is to
> make just a few surgical changes, and put each one in a different
> patch, either linking to the issue tracker, or provide a description
> of what it fixes. And test, test, test, test...
>
> Hope that helps!
>
> -Doug
>
> ------------------------------------------------------------------------------
> _______________________________________________
> Gramps-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/gramps-devel
>

------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel


------------------------------------------------------------------------------

_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: How to use SVN

Peter Landgren
<snip>
> For 1., not many people are still running python 2.5, and if they do, they
> probably can only upgrade if they do it manually, so obtaining last narweb
> from repo and overwriting the install, should not be difficult for those
> users (but annoying). So that can wait some.

There is still the problem with Python 2.6 and and the extremely slow XML/GEDCOM import in Windows.
I have not yet been able to describe how to install bsddb3 to fix this issue. I have a new Windows 7
box now and will install Python 2.6 and bsddb3. and document it ASAP.
/Peter


> Benny
>
> > Stéphane
> >
> > On Wed, Apr 21, 2010 at 23:31, Doug Blank <[hidden email]> wrote:
> > > Rob (and others getting started with svn),
> > >
> > > First, thanks for your continued work on NarWeb!
> > >
> > > But, there are too many changes in:
> >
> > http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gram
> >ps32/src/plugins/webreport/NarrativeWeb.py?r1=15258&r2=15257&pathrev=15258
> >
> > > You need to break up each change to fix one particular thing. Some of
> > > your changes have broken things that were working yesterday, and this
> > > is too close to a release to go back and try to find what change
> > > caused the issue.
> > >
> > > Also, you should not introduce new features into any maintenance
> > > branch---unless you have a very good reason to, and have discussed
> > > this on the mailing list.
> > >
> > > Revision control is designed so that you can examine changes that
> > > introduce regressions, and easily revert if necessary. But such a
> > > monolithic set of changes makes that impossible.
> > >
> > > If you would, please go back to the revision before, and apply your
> > > changes one fix at a time. For example, here is a patch that does one
> > > thing:
> >
> > http://gramps.svn.sourceforge.net/viewvc/gramps/branches/maintenance/gram
> >ps32/src/plugins/webreport/NarrativeWeb.py?r1=15219&r2=15221&pathrev=15258
> >
> > > I see at least one error in showing regions in a thumbnail, but I
> > > haven't even begun to test all of the changes that you made. You want
> > > to be able to guarantee that every change that you made will not break
> > > anything. Of course, you can't be 100% sure (no one can) but you need
> > > to be as certain as one possibly can, and one way to do that is to
> > > make just a few surgical changes, and put each one in a different
> > > patch, either linking to the issue tracker, or provide a description
> > > of what it fixes. And test, test, test, test...
> > >
> > > Hope that helps!
> > >
> > > -Doug
> >
> > -------------------------------------------------------------------------
> >-----
> >
> > > _______________________________________________
> > > Gramps-devel mailing list
> > > [hidden email]
> > > https://lists.sourceforge.net/lists/listinfo/gramps-devel
> >
> > -------------------------------------------------------------------------
> >----- _______________________________________________
> > Gramps-devel mailing list
> > [hidden email]
> > https://lists.sourceforge.net/lists/listinfo/gramps-devel

--
Peter Landgren
Talken Hagen
671 94  BRUNSKOG
0570-530 21
070-345 0964
[hidden email]
Skype: pgl4820.2


------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|

Re: How to use SVN

Tim Lyons
Administrator
In reply to this post by DS Blank
> 2010/4/22 St?phane Charette <[hidden email]>
>
>
>> This is not good.  I began working on the 3.2.1 release earlier
>> tonight as I happen to have an evening where I could break free from
>> work for a few hours.  Didn't know things had just recently been
>> broken.
>>
>>
>
> Don't blame yourself. I should have mailed the list the release was
> imminent, Doug should have reverted when he saw it then mail Rob  
> and the
> list, Rob should never have committed it, ... We can pass blame  
> around for a
> long time.
>
>
>
>>
>> I just sent the announcement out, and now I see this e-mail thread...
>>  <sigh>
>>
>> Let me know if we're going to need a quick fix.  It is nearing 2am, I
>> need to get to bed.  I'll look for e-mail updates tomorrow before
>> work.
>>
>>
>
> Ok, and many thanks for the release!
>
> Yes, the commit of Rob is inside 3.2.1:
> http://gramps.svn.sourceforge.net/viewvc/gramps/tags/gramps-3.2.1/ 
> src/plugins/webreport/NarrativeWeb.py?view=log
> You made the tag on 9:12, I reverted the change on 9:28. Close.
>
> Doug, as you started this thread, is a quick new release 3.2.2 needed
> without commit?
> What I know now:
>
> 1. in python 2.5, nar web will probably not even load, if it loads,  
> then it
> will crash on run (with statement import from future is removed)
>


Oh dear. python2.6 does not work for me on Mac OS X, and also I think  
there are problems with Windows about python 2.6 being much slower  
than python 2.5. This was going to be resolved I think when there was  
an update to bsddb for Windows, but I don't think that is there yet.

My vote would be for a swift 3.2.1_1 or something to get it working  
as before again.



> 2. you mention a bug in image regions. Is it serious?
>
> For 1., not many people are still running python 2.5, and if they  
> do, they
> probably can only upgrade if they do it manually, so obtaining last  
> narweb
> from repo and overwriting the install, should not be difficult for  
> those
> users (but annoying). So that can wait some.
>
Not so easy for me.

Regards,
Tim.

> Benny
>

------------------------------------------------------------------------------
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel