ReleaseEngineering/How To/VCSSync: Difference between revisions
< ReleaseEngineering | How To
Jump to navigation
Jump to search
| Line 19: | Line 19: | ||
== Troubleshooting == | == Troubleshooting == | ||
=== How to deal with non-ffwd === | === How to deal with non-ffwd === | ||
| Line 26: | Line 24: | ||
=== How to deal with completely resetting gecko-projects === | === How to deal with completely resetting gecko-projects === | ||
=== How to deal with GECKO90_2011121217_RELBRANCH === | |||
We were getting email with the following failure: | |||
<pre> | |||
11:14:01 ERROR - remote: error: denying non-fast-forward refs/heads/GECKO90_2011121217_RELBRANCH (you should pull first) | |||
11:14:01 ERROR - ! [remote rejected] GECKO90_2011121217_RELBRANCH -> GECKO90_2011121217_RELBRANCH (non-fast-forward) | |||
11:14:01 ERROR - error: failed to push some refs to '/opt/vcs2vcs/build/target/beagle/.git' | |||
11:14:02 ERROR - Return code: 256 | |||
11:14:02 ERROR - mozilla-beta: Can't push /opt/vcs2vcs/build/conversion/beagle to /opt/vcs2vcs/build/target/beagle/.git! | |||
11:14:02 ERROR - This was a test push that failed; not proceeding any further with mozilla-beta! | |||
</pre> | |||
To debug: | |||
<pre> | |||
# vcs2vcs@vcssync1 | |||
cd /opt/vcs2vcs/build/target/beagle | |||
git show GECKO90_2011121217_RELBRANCH # this gave 1003ec79451969335008880ad82e305d93b89642 | |||
cd /opt/vcs2vcs/build/conversion/beagle | |||
git show GECKO90_2011121217_RELBRANCH # this gave fac7279c040d643fb4c35105fa85b9335ba2c2f9 | |||
git merge-base fac7279c040d643fb4c35105fa85b9335ba2c2f9 1003ec79451969335008880ad82e305d93b89642 | |||
</pre> | |||
The merge-base returned <code>fac7279c040d643fb4c35105fa85b9335ba2c2f9</code>. That means that <code>fac727</code> is a parent to <code>1003ec</code>. No sha divergence, only stale history. | |||
# | |||
Revision as of 18:21, 14 October 2013
This is documentation on the mozharness-based vcs sync processes.
See Hal's docs for the legacy process.
Emails
Maintenance
How to add a repo to gecko-dev or gecko-git
How to add a project to project-branch conversion
How to add a locale to l10n conversion
How to adjust email notifications
How to force the process to pull/bookmark/convert/push a repo, even if nothing's changed
Troubleshooting
How to deal with non-ffwd
How to deal with project branch reset
How to deal with completely resetting gecko-projects
How to deal with GECKO90_2011121217_RELBRANCH
We were getting email with the following failure:
11:14:01 ERROR - remote: error: denying non-fast-forward refs/heads/GECKO90_2011121217_RELBRANCH (you should pull first) 11:14:01 ERROR - ! [remote rejected] GECKO90_2011121217_RELBRANCH -> GECKO90_2011121217_RELBRANCH (non-fast-forward) 11:14:01 ERROR - error: failed to push some refs to '/opt/vcs2vcs/build/target/beagle/.git' 11:14:02 ERROR - Return code: 256 11:14:02 ERROR - mozilla-beta: Can't push /opt/vcs2vcs/build/conversion/beagle to /opt/vcs2vcs/build/target/beagle/.git! 11:14:02 ERROR - This was a test push that failed; not proceeding any further with mozilla-beta!
To debug:
# vcs2vcs@vcssync1 cd /opt/vcs2vcs/build/target/beagle git show GECKO90_2011121217_RELBRANCH # this gave 1003ec79451969335008880ad82e305d93b89642 cd /opt/vcs2vcs/build/conversion/beagle git show GECKO90_2011121217_RELBRANCH # this gave fac7279c040d643fb4c35105fa85b9335ba2c2f9 git merge-base fac7279c040d643fb4c35105fa85b9335ba2c2f9 1003ec79451969335008880ad82e305d93b89642
The merge-base returned fac7279c040d643fb4c35105fa85b9335ba2c2f9. That means that fac727 is a parent to 1003ec. No sha divergence, only stale history.