Hi Everyone,
I wanted to apologise for what I just did to the svn repo: a major screw up. I use git, and for those who know about it, you know you can work with local branches that have local commits. Now I have my way of putting everything from one branch together in one commit (instead of multiple) and then sending it upstream with the right comments, but for some reason I don't understand it completely screwed up. Even though I did it the way I always do it, it still sent all these individual commits to the repository !???!
I usually don't give these local commits meaningful comments, and because of this all these bad comments were also sent to the repository. Even worse is that the diff's are a total mess. Files are created and removed again, changed and then changed back, it really is a total mess 
The final result is what it is supposed to be however it was supposed to be in one single commit with meaningful comments and meaningfull diff information.
I am really sorry this happened.
With Regards,
Niels Charlier
Hey Niels,
THanks for the head up. It happens.
One thing you could do is roll back the changes, and then reapply them in more meaningful chunks with good comments etc. Shouldn’t be too much work… generating the reverse diff should be easy enough, and then you can use git mojo (rebasing, etc…) to reorganize those commits.
Anyways, just a suggestion, not necessary imo since it looks like the commits were constrained only to app schema, i see you rolled back the wms module commits. So I for one can get over it 
-Justin
On Tue, May 8, 2012 at 3:44 PM, Niels Charlier <niels@anonymised.com> wrote:
Hi Everyone,
I wanted to apologise for what I just did to the svn repo: a major screw
up. I use git, and for those who know about it, you know you can work
with local branches that have local commits. Now I have my way of
putting everything from one branch together in one commit (instead of
multiple) and then sending it upstream with the right comments, but for
some reason I don’t understand it completely screwed up. Even though I
did it the way I always do it, it still sent all these individual
commits to the repository !!!
I usually don’t give these local commits meaningful comments, and
because of this all these bad comments were also sent to the repository.
Even worse is that the diff’s are a total mess. Files are created and
removed again, changed and then changed back, it really is a total mess
The final result is what it is supposed to be however it was supposed to
be in one single commit with meaningful comments and meaningfull diff
information.
I am really sorry this happened.
With Regards,
Niels Charlier
Live Security Virtual Conference
Exclusive live event will cover all the ways today’s security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
–
Justin Deoliveira
OpenGeo - http://opengeo.org
Enterprise support for open source geospatial.
Hi Niels,
I was just going to say the same. Shit happens.
I think it would be useful to roll back all changes with a
counter-commit stating in the comment that you're rolling back rX to
rY and then re apply the changes either as a single commit or a bunch
with meaningful commit messages.
If you're going to do so I think we can refrain from committing
anything else for a some time in order not to step on your shoes.
But, just MHO, not a blocker by any means (though, yet another reason
to switch definitely to git? you could have done git reset --hard and
push --force).
Cheers,
Gabriel
On Tue, May 8, 2012 at 7:49 PM, Justin Deoliveira <jdeolive@anonymised.com> wrote:
Hey Niels,
THanks for the head up. It happens.
One thing you could do is roll back the changes, and then reapply them in
more meaningful chunks with good comments etc. Shouldn't be too much work...
generating the reverse diff should be easy enough, and then you can use git
mojo (rebasing, etc...) to reorganize those commits.
Anyways, just a suggestion, not necessary imo since it looks like the
commits were constrained only to app schema, i see you rolled back the wms
module commits. So I for one can get over it
-Justin
On Tue, May 8, 2012 at 3:44 PM, Niels Charlier <niels@anonymised.com> wrote:
Hi Everyone,
I wanted to apologise for what I just did to the svn repo: a major screw
up. I use git, and for those who know about it, you know you can work
with local branches that have local commits. Now I have my way of
putting everything from one branch together in one commit (instead of
multiple) and then sending it upstream with the right comments, but for
some reason I don't understand it completely screwed up. Even though I
did it the way I always do it, it still sent all these individual
commits to the repository !???!
I usually don't give these local commits meaningful comments, and
because of this all these bad comments were also sent to the repository.
Even worse is that the diff's are a total mess. Files are created and
removed again, changed and then changed back, it really is a total mess
The final result is what it is supposed to be however it was supposed to
be in one single commit with meaningful comments and meaningfull diff
information.
I am really sorry this happened.
With Regards,
Niels Charlier
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
--
Justin Deoliveira
OpenGeo - http://opengeo.org
Enterprise support for open source geospatial.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
--
Gabriel Roldan
OpenGeo - http://opengeo.org
Expert service straight from the developers.
Okay, I can do that today no problem, but then you will have to wait with committing for a couple of more hours.
Cheers
Niels
On 09/05/12 00:58, Gabriel Roldan wrote:
Hi Niels,
I was just going to say the same. Shit happens.
I think it would be useful to roll back all changes with a
counter-commit stating in the comment that you're rolling back rX to
rY and then re apply the changes either as a single commit or a bunch
with meaningful commit messages.
If you're going to do so I think we can refrain from committing
anything else for a some time in order not to step on your shoes.
But, just MHO, not a blocker by any means (though, yet another reason
to switch definitely to git? you could have done git reset --hard and
push --force).
Cheers,
Gabriel
On Tue, May 8, 2012 at 7:49 PM, Justin Deoliveira<jdeolive@anonymised.com> wrote:
Hey Niels,
THanks for the head up. It happens.
One thing you could do is roll back the changes, and then reapply them in
more meaningful chunks with good comments etc. Shouldn't be too much work...
generating the reverse diff should be easy enough, and then you can use git
mojo (rebasing, etc...) to reorganize those commits.
Anyways, just a suggestion, not necessary imo since it looks like the
commits were constrained only to app schema, i see you rolled back the wms
module commits. So I for one can get over it
-Justin
On Tue, May 8, 2012 at 3:44 PM, Niels Charlier<niels@anonymised.com> wrote:
Hi Everyone,
I wanted to apologise for what I just did to the svn repo: a major screw
up. I use git, and for those who know about it, you know you can work
with local branches that have local commits. Now I have my way of
putting everything from one branch together in one commit (instead of
multiple) and then sending it upstream with the right comments, but for
some reason I don't understand it completely screwed up. Even though I
did it the way I always do it, it still sent all these individual
commits to the repository !???!
I usually don't give these local commits meaningful comments, and
because of this all these bad comments were also sent to the repository.
Even worse is that the diff's are a total mess. Files are created and
removed again, changed and then changed back, it really is a total mess
The final result is what it is supposed to be however it was supposed to
be in one single commit with meaningful comments and meaningfull diff
information.
I am really sorry this happened.
With Regards,
Niels Charlier
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
--
Justin Deoliveira
OpenGeo - http://opengeo.org
Enterprise support for open source geospatial.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
Okay, it’s been done. Everything was reverted back and then one single readable commit
All these revisions can now just be ignored
That has the advantage of clarity
On 9 mei 2012 07:12 “Niels Charlier” niels@anonymised.com wrote:
Okay, I can do that today no problem, but then you will have to wait
with committing for a couple of more hours.
Cheers
Niels
On 09/05/12 00:58, Gabriel Roldan wrote:
Hi Niels,
I was just going to say the same. Shit happens.
I think it would be useful to roll back all changes with a
counter-commit stating in the comment that you’re rolling back rX to
rY and then re apply the changes either as a single commit or a bunch
with meaningful commit messages.
If you’re going to do so I think we can refrain from committing
anything else for a some time in order not to step on your shoes.
But, just MHO, not a blocker by any means (though, yet another reason
to switch definitely to git? you could have done git reset --hard and
push --force).
Cheers,
Gabriel
On Tue, May 8, 2012 at 7:49 PM, Justin Deoliveirajdeolive@anonymised.com wrote:
Hey Niels,
THanks for the head up. It happens.
One thing you could do is roll back the changes, and then reapply them in
more meaningful chunks with good comments etc. Shouldn’t be too much work…
generating the reverse diff should be easy enough, and then you can use git
mojo (rebasing, etc…) to reorganize those commits.
Anyways, just a suggestion, not necessary imo since it looks like the
commits were constrained only to app schema, i see you rolled back the wms
module commits. So I for one can get over it
-Justin
On Tue, May 8, 2012 at 3:44 PM, Niels Charlier<niels@anonymised.com.> wrote:
Hi Everyone,
I wanted to apologise for what I just did to the svn repo: a major screw
up. I use git, and for those who know about it, you know you can work
with local branches that have local commits. Now I have my way of
putting everything from one branch together in one commit (instead of
multiple) and then sending it upstream with the right comments, but for
some reason I don’t understand it completely screwed up. Even though I
did it the way I always do it, it still sent all these individual
commits to the repository !!!
I usually don’t give these local commits meaningful comments, and
because of this all these bad comments were also sent to the repository.
Even worse is that the diff’s are a total mess. Files are created and
removed again, changed and then changed back, it really is a total mess
The final result is what it is supposed to be however it was supposed to
be in one single commit with meaningful comments and meaningfull diff
information.
I am really sorry this happened.
With Regards,
Niels Charlier
Live Security Virtual Conference
Exclusive live event will cover all the ways today’s security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
Geoserver-devel mailing list
Geoserver-devel@anonymised.comts.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
–
Justin Deoliveira
OpenGeo - http://opengeo.org
Enterprise support for open source geospatial.
Live Security Virtual Conference
Exclusive live event will cover all the ways today’s security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
Live Security Virtual Conference
Exclusive live event will cover all the ways today’s security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel