Skip to content

Commit 6d1e99e

Browse files
committed
advice on josh pushing
1 parent 7c12ed1 commit 6d1e99e

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/tools/miri/CONTRIBUTING.md

+7
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,13 @@ needed.
296296

297297
### Exporting changes to the rustc repo
298298

299+
Keep in mind that pushing is the most complicated job that josh has to do --
300+
pulling just filters the rustc history, but pushing needs to construct a new
301+
rustc history that would filter to the given Miri history! To avoid problems, it
302+
is a good idea to always pull immediately before you push. In particular, you
303+
should never do two josh pushes without an intermediate pull; that can lead to
304+
duplicated commits.
305+
299306
Josh needs to be running, as described above. We will use the josh proxy to push
300307
to your fork of rustc. Run the following in the Miri repo, assuming we are on an
301308
up-to-date master branch:

0 commit comments

Comments
 (0)