Moving to Git

[PowerDiver]

There is a bug in decrease_stat due to cloned code. If you try to decrease a stat when it is fully drained, nothing happens. It shouldn't be surprising I'm the only one who ever encountered this. I'll submit a fix some week or other. However, so long as I am mucking with stat code:

Should we go back to 3.1.0 approach of stat increases always being 1 below 18, and 10 percentiles at 18 or above? That was reverted due to lack of stat potions, but with rarity changes stats are easier to get now.

[d_m]

Should we go back to 3.1.0 approach of stat increases always being 1 below 18, and 10 percentiles at 18 or above? That was reverted due to lack of stat potions, but with rarity changes stats are easier to get now.

I would be fine with this.

[d_m]

Ok, I've just spent about two hours trying to merge the master branch into my own and I've come to the conclusion that I don't understand at all how git works.

I often have trouble iguring out the correct application of branch/merge/checkout/pull/push. I've been taking notes on things I do in Git in a textfile--eventually I'm going to try to create a section in the wiki for how to do things.

Do you use IRC at all? #angband-dev has a lot of people who are better at Git than I am and often help me (elly, takkaria, magnate, myshkin, etc, etc). I definitely recommend it.

[takkaria]

There is a bug in decrease_stat due to cloned code. If you try to decrease a stat when it is fully drained, nothing happens. It shouldn't be surprising I'm the only one who ever encountered this. I'll submit a fix some week or other. However, so long as I am mucking with stat code:

Should we go back to 3.1.0 approach of stat increases always being 1 below 18, and 10 percentiles at 18 or above? That was reverted due to lack of stat potions, but with rarity changes stats are easier to get now.

+1 from me

[takkaria]

Ok, I've just spent about two hours trying to merge the master branch into my own and I've come to the conclusion that I don't understand at all how git works.

Online sites don't seem to help at all, I'm missing something *much* more fundamental.

I'd be content to just overwrite my branch with the current angband master branch, but I can't even get that to work...

I'm so useless...

edit: Ok, i think I accomplished this in the most asinine way imaginable... It still would be nice if someone was to tell me what I should have done...

you may find http://trac.rephial.org/wiki/GitUsage useful.

[Nick]

Ok, I've just spent about two hours trying to merge the master branch into my own and I've come to the conclusion that I don't understand at all how git works.

I have achieved this once, and IIRC the key is to use 'upstream' (which should be takkaria/angband if you forked from that). I think 'git merge remotes/upstream/master' may be the thing you want, although you may need to do something like 'git remote add <upstream URL>' first. Maybe.

[Magnate]

I have achieved this once, and IIRC the key is to use 'upstream' (which should be takkaria/angband if you forked from that). I think 'git merge remotes/upstream/master' may be the thing you want, although you may need to do something like 'git remote add <upstream URL>' first. Maybe.

If you create your git repository with "git clone <wherever>" then the thing you cloned is called 'origin'. So you need

git fetch origin
git merge origin/master

To merge origin/master into your current branch.

@fizzix: what was the problem - not knowing the syntax for the merge or not being able to merge successfully? If your branch is too far forked you may have dozens of conflicts.

[Nick]

If you create your git repository with "git clone <wherever>" then the thing you cloned is called 'origin'.

Right. I hit the fork button on github, then cloned the result - hence my clone is origin. I'm sure we're helping.

[fizzix]

If you create your git repository with "git clone <wherever>" then the thing you cloned is called 'origin'. So you need

git fetch origin
git merge origin/master

To merge origin/master into your current branch.

@fizzix: what was the problem - not knowing the syntax for the merge or not being able to merge successfully? If your branch is too far forked you may have dozens of conflicts.

there were conflicts problems. I wanted to accept the origin version, but it wouldn't let me. Eventually I gave up, downloaded the files directly, replaced them all manually, and then still had trouble merging. Apparently it worked eventually, as it looks like I'm successfully merged and I can start trying to figure out how lighting squares works.

[takkaria]

there were conflicts problems. I wanted to accept the origin version, but it wouldn't let me. Eventually I gave up, downloaded the files directly, replaced them all manually, and then still had trouble merging. Apparently it worked eventually, as it looks like I'm successfully merged and I can start trying to figure out how lighting squares works.

Lighting stuff is all in cave.c, pretty much.

[Magnate]

there were conflicts problems. I wanted to accept the origin version, but it wouldn't let me. Eventually I gave up, downloaded the files directly, replaced them all manually, and then still had trouble merging. Apparently it worked eventually, as it looks like I'm successfully merged and I can start trying to figure out how lighting squares works.

Fine - that isn't a git problem, as you'd have to deal with conflicts using any VCS. When 3.2 is out I'll try and come up with a better way of keeping track of who is messing which which bits of code so that we can minimise merge conflicts.

[Magnate]

Right. I hit the fork button on github, then cloned the result - hence my clone is origin. I'm sure we're helping.

Indeed - I think what people may not have realised reading your last post is that you created the remote "upstream" manually, after the clone of origin. It probably isn't ideal that when I've described that process on the dev wiki, I've called the new remote "official" instead.

Never mind - when we are assimilated all these problems will be solved ...

[Rizwan]

Never mind - when we are assimilated all these problems will be solved ...

Nooooooo I don't want to be assimilated

Now you are scaring me with that Borg-like talk