Re: [Potlatch-dev] State of play
On 11/03/12 00:01, Steve Bennett wrote: On Sat, Mar 10, 2012 at 6:41 PM, Tom Hughes wrote: I would just delete them once they aren't needed anymore. Delete them locally, you mean? Do you then need to push the deletion? Well the two things actually separate. You can delete a local branch with "git branch -d " and a remote branch by pushing with "git push :". Tom -- Tom Hughes (t...@compton.nu) http://compton.nu/ ___ Potlatch-dev mailing list Potlatch-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/potlatch-dev
Re: [Potlatch-dev] State of play
On Sat, Mar 10, 2012 at 6:41 PM, Tom Hughes wrote: > I would just delete them once they aren't needed anymore. Delete them locally, you mean? Do you then need to push the deletion? Steve ___ Potlatch-dev mailing list Potlatch-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/potlatch-dev
Re: [Potlatch-dev] State of play
On 10/03/12 03:08, Steve Bennett wrote: One thing I'm not sure about in this whole approach is what you're supposed to do with the zillions of branches you end up creating. Assuming that the pull requests all get accepted, am I then supposed to delete or archive these old branches? Seems like even more overhead, especially for tiny fixes... I would just delete them once they aren't needed anymore. And...now I see bad news in https://github.com/openstreetmap/potlatch2/network Am I right in saying that systemed is actually *behind* openstreetmap? So all my new branches are actually not based off the latest master at all? Doesn't look that way to me - systemed is about 5 commits ahead. Tom -- Tom Hughes (t...@compton.nu) http://compton.nu/ ___ Potlatch-dev mailing list Potlatch-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/potlatch-dev
Re: [Potlatch-dev] State of play
On Mon, Mar 5, 2012 at 3:01 PM, Steve Bennett wrote: > My Git-fu is gradually improving to the point where I think I can > probably decompose them. I'll try and cherry pick them apart and > resubmit as individual pull requests. Ok, done. For general education, here's what I did: 1) git pull systemed master 2) Go through the list of commits on master here: https://github.com/stevage/potlatch2/commits/master 3) For each one, create a new branch based off current master: git checkout -b voltage-tweaks systemed/master 4) Cherry pick relevant commits over (using the list on github to see the commit references): git cherry-pick 1060008 7226687 cd47df6 5) Push to github: git push origin voltage-tweaks 6) Issue a pull request from there, remembering to pull-request to systemed, not openstreetmap. 7) Repeat from step 3. One thing I'm not sure about in this whole approach is what you're supposed to do with the zillions of branches you end up creating. Assuming that the pull requests all get accepted, am I then supposed to delete or archive these old branches? Seems like even more overhead, especially for tiny fixes... And...now I see bad news in https://github.com/openstreetmap/potlatch2/network Am I right in saying that systemed is actually *behind* openstreetmap? So all my new branches are actually not based off the latest master at all? Steve ___ Potlatch-dev mailing list Potlatch-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/potlatch-dev
Re: [Potlatch-dev] State of play
On 5 March 2012 04:01, Steve Bennett wrote: >> "undo on creating way" fix, > > Definitely worthy of review - it's totally possible that I broke > something else. Anyone else want to have a look at it? I guess we > don't have any tests? We don't have any tests that cover starting drawing a new way. I'd absolutely love to have tests that cover all the Actions though - it's so important not to mess up the data in some subtle way while refactoring. After that, we can test whether "pressing the buttons" has the desired effects. There are some very basic Action tests at https://github.com/systemed/potlatch2/tree/master/tests/src/net/systemeD/halcyon/connection/actions already, but to say they are "very basic" is slightly overselling them! We're also lacking tests on most of the Entity functionality too. Cheers, Andy ___ Potlatch-dev mailing list Potlatch-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/potlatch-dev
Re: [Potlatch-dev] State of play
On Mon, Mar 5, 2012 at 11:54 AM, Richard Fairhurst wrote: > Today's commit log is at: > https://github.com/systemed/potlatch2/commits/master Thanks for the update. It's nice to get acknowledgement of our work, even if it's not merged yet. > I've not yet merged in Steve's highway=proposed/construction addition, the I think this one is actually pretty straightforward, surprisingly. It would be nice to make the proposed/construction stuff work like a dropdown on every normal highway, but this basic implementation is still a lot better than nothing. Although my bulldozer artwork could be improved :) > "undo on creating way" fix, Definitely worthy of review - it's totally possible that I broke something else. Anyone else want to have a look at it? I guess we don't have any tests? and the two combined commits which need to be > cherry-picked and merged in individually > (https://github.com/systemed/potlatch2/pull/24 and > https://github.com/systemed/potlatch2/pull/25) - I'll look at these when I > have time and sufficient git-fu. My Git-fu is gradually improving to the point where I think I can probably decompose them. I'll try and cherry pick them apart and resubmit as individual pull requests. > Current most obvious bug that I can see is that (in en-GB at least) the > dreaded "[object Object]" is back on the GPS menu. Yeah, I've had that intermittently on my XP/firefox desktop. Only intermittently though... Steve ___ Potlatch-dev mailing list Potlatch-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/potlatch-dev
Re: [Potlatch-dev] State of play
Current most obvious bug that I can see is that (in en-GB at least) the dreaded "[object Object]" is back on the GPS menu. Oh, and landuse=cemetery renders as a black opaque area. Appropriate I guess but probably not great for editing. :) cheers Richard ___ Potlatch-dev mailing list Potlatch-dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/potlatch-dev
