Drop obsolete debian/README.source
Hideki Yamane
3 years ago
| 0 | Merging upstream releases | |
| 1 | ========================= | |
| 2 | ||
| 3 | (copied from samba, original text by Steve Langasek) | |
| 4 | ||
| 5 | $ svn-load -t packages/fonts-arabeyes/tags/upstream_${version} \ | |
| 6 | svn+ssh://svn.debian.org/svn/pkg-fonts packages/fonts-arabeyes/branches/upstream . | |
| 7 | ||
| 8 | The svn-load command is in the aptly-named "svn-load" package. The | |
| 9 | above is the simplest use of svn-load to merge a new upstream version | |
| 10 | into the "upstream" branch and copy it to a per-version tag directory; | |
| 11 | please see "svn-load --help" for a list of other options that are of | |
| 12 | interest. In particular, you may find that the --wc option saves time | |
| 13 | if you're on a slow connection, and the "-m" option may be needed if | |
| 14 | files are moved around in the upstream repository and this needs to be | |
| 15 | indicated to prevent subversion treating this as addition and deletion | |
| 16 | of unrelated files. | |
| 17 | ||
| 18 | Note that this only imports the new upstream version into the branch, it | |
| 19 | doesn't merge it onto the trunk. For this, you should go to your | |
| 20 | (clean) working copy of the trunk and run: | |
| 21 | ||
| 22 | $ svn merge \ | |
| 23 | svn+ssh://svn.debian.org/svn/pkg-fonts/packages/fonts-arabeyes/tags/upstream_{prev_version,new_version} | |
| 24 | $ svn diff # (to make sure the diff makes sense) | |
| 25 | $ svn commit -m "merge upstream $version" |