fiddlerwoaroof/crawl - Change S3CKMIO5JZKJI3P2ABDWEREKK66LKNT5ZCBVM3VRSKGWDMAU2JWQC

Update docs/develop/release.txt with git commands. Reviewing by more experienced git users appreciated.

Section 0. should probably be rewritten, as git should make branching and merging much smoother.

Signed-off-by: Eino Keskitalo <evktalo@users.sourceforge.net>

Created by Eino Keskitalo on October 13, 2009

S3CKMIO5JZKJI3P2ABDWEREKK66LKNT5ZCBVM3VRSKGWDMAU2JWQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/docs/develop/release.txt at line 9 [3.216]

B:BD[3.593] → [3.593:669]

    until the release is not too far off. Once trunk has been branched, you

[3.593]

[3.669]

    until the release is not too far off. Once master has been branched, you

Replacement in crawl-ref/docs/develop/release.txt at line 18 [3.216]

B:BD[3.1026] → [3.1026:1221]

1.  Branch trunk into the new version
    svn cp https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk
    https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.X

[3.1026]

[3.1221]

1.  Branch master into the new version
    git push origin origin:refs/heads/stone_soup.0.X

Replacement in crawl-ref/docs/develop/release.txt at line 46 [3.216]
B:BD[3.2383] → [3.2383:2408]
```
        * saving/loading
```
[3.2383]
[3.2408]
```
        * saving/loading (including loading from previous minor version)
```

Replacement in crawl-ref/docs/develop/release.txt at line 63 [3.216]

B:BD[3.3197] → [3.3197:3368]

    svn cp https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.X
    https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/tags/stone_soup-0.X

[3.3197]

[3.3368]

    In the branch you're about to tag:
    git tag -a release-0.X.y
    You'll need to push the tag into repository:
    git push --tags

Replacement in crawl-ref/docs/develop/release.txt at line 76 [3.216]

∅:D[2.245] → [3.4302:4389]

B:BD[3.4302] → [3.4302:4389]

    svn co https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/tags/stone_soup-0.X

[2.245]

[3.4389]

    git checkout -b stone_soup-0.X release-0.X.y

Replacement in crawl-ref/docs/develop/release.txt at line 78 [3.216]

B:BD[3.4390] → [3.4390:4658]

    Do a clean checkout into a new folder, so you don't get any compilation
    stuff into the distribution. Package the source (as described in 6.) and
    build the binaries. If you want you can do some more sanity testing but it
    shouldn't be necessary anymore.

[3.4390]

[3.4658]

    You may want to make a new shallow clone into a new folder, to make sure you    don't get any compilation stuff into the distribution.
    Package the source (as described in 6.) and build the binaries. If you want
    you can do some more sanity testing but it shouldn't be necessary anymore.

Replacement in crawl-ref/docs/develop/release.txt at line 110 [3.216]
∅:D[2.1314] → [3.5163:5222]
B:BD[3.5163] → [3.5163:5222]
```
    ssh -t username,crawl-ref@shell.sourceforge.net create
```
[2.1314]
[3.5222]
```
    ssh -t username,crawl-ref@web.sourceforge.net create
```