Changes between Version 1 and Version 2 of CommittingYourChanges

Timestamp:

07/01/15 10:42:17 (9 years ago)

Author:

jdreed

Comment:

--

CommittingYourChanges

@@ -4 +4 @@
 * ensure you have [wiki:WorkingWithGithub set up your fork and remote] for the module you're working on.
 * ensure you have read [wiki:WorkingWithTheRepository], especially the part on native vs non-native packages, deatched HEADs, and branches.
+
+**NOTE**: This document assumes that the remote named `origin` is the repository on `git.mit.edu`.
 
 == Native Packages ==
@@ -20 +22 @@
 * Tag your most recent commit with the version number (this MUST match the version number as described above).
  * `git tag -a 10.0.3 a4b5c6d7`
-* Push your master, and the tag to `origin` (`git+ssh://git.mit.edu/[...]`).
+* Push your master, and the tag to `origin`.
  * `git push origin master`
  * `git push origin 10.0.3`
@@ -38 +40 @@
 * Push to `origin`:
  * `git push origin debian`
+
+== Native Packages ==
+
+Reminder: Native packages have a single `master` branch, and are **not** tagged at commit time.
+
+* Make your changes to the code, and commit them.
+* Ensure you update the `debian/changelog` file with a new entry for the new version.  Unlike non-native packages, version strings should just be numbers (e.g. 1.5.7).
+* Commit your changes, and push them to **your** remote.  Submit a pull request as [wiki:WorkingWithGithub described here], and wait for code review, or decide that this is important enough that it doesn't need code review.
+
+* Once your pull request is approved, push to `origin`:
+ * `git push origin master`