File tree Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -296,6 +296,13 @@ needed.
296
296
297
297
### Exporting changes to the rustc repo
298
298
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
+
299
306
Josh needs to be running, as described above. We will use the josh proxy to push
300
307
to your fork of rustc. Run the following in the Miri repo, assuming we are on an
301
308
up-to-date master branch:
You can’t perform that action at this time.
0 commit comments