Jason Harris avatar Jason Harris committed 8aae0bd

Comments (0)

Files changed (1)

 # Ignore this changeset because it contains the nuclear launch code that Billy included
 a4988662d998b8d986bdaec43079475827aa31d0 # The "launch" code commit
+=== What does a user do if changesets are rejected ===
+If you are trying to push some changesets to the server but the push is rejected because some of the changesets are excluded from the repository, then likely you should:
+# Read any messages from the person who specifically interdicted the changesets.
+# Determine in your local repository if you have committed anything on top of these bad changesets.
+# If you have committed stuff on top of these bad changesets then move your changesets to another part of the commit tree, using say ((('hg export'}}} and {{{'hg import'}}}, or using rebase, or using transplant, or the mq extension. (Now would likely be a good time to use {{{'hg clone'}}} to make a "dummy" clone of the repository just in case you stuff up the history editing.)
+# Locally use {{{'hg strip' }}} to get rid of the bad changesets and their descendants.
+See [[http://mercurial.selenic.com/wiki/EditingHistory|editing history]] and in particular [[http://mercurial.selenic.com/wiki/RebaseProject|rebasing]], [[http://mercurial.selenic.com/wiki/TransplantExtension|transplant]] and [[http://mercurial.selenic.com/wiki/Strip|strip]]
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.