| OLD | NEW |
|---|
| 1 #!/usr/bin/env bash | 1 #!/usr/bin/env bash |
| 2 . git-drover.demo.common.sh | 2 . git-drover.demo.common.sh |
| 3 | 3 |
| 4 drover_c "This change needs to go to branch 9999" | 4 drover_c "This change needs to go to branch 9999" |
| 5 | 5 |
| 6 echo "# Here's a commit (from some.committer) that we want to 'drover'." | 6 echo "# Here's a commit (from some.committer) that we want to 'drover'." |
| 7 run git log -n 1 --pretty=fuller | 7 run git log -n 1 --pretty=fuller |
| 8 echo | 8 echo |
| 9 echo "# Now do the 'drover'." | 9 echo "# Now do the 'drover'." |
| 10 pcommand git drover --branch 9999 \ | 10 pcommand git drover --branch 9999 \ |
| 11 --cherry-pick $(git show-ref -s pick_commit) | 11 --cherry-pick $(git show-ref -s pick_commit) |
| 12 | 12 |
| 13 echo "Going to cherry-pick" | 13 echo "Going to cherry-pick" |
| 14 echo '"""' | 14 echo '"""' |
| 15 output git log -n 1 | 15 output git log -n 1 |
| 16 echo '"""' | 16 echo '"""' |
| 17 echo "to 9999. Continue (y/n)? y" | 17 echo "to 9999. Continue (y/n)? y" |
| 18 echo | 18 echo |
| 19 echo "Error: Patch failed to apply." |
| 20 echo |
| 21 echo "A workdir for this cherry-pick has been created in" |
| 22 echo " /tmp/drover_9999" |
| 23 echo |
| 24 echo "To continue, resolve the conflicts there and run" |
| 25 echo " git drover --continue /tmp/drover_9999" |
| 26 echo |
| 27 echo "To abort this cherry-pick run" |
| 28 echo " git drover --abort /tmp/drover_9999" |
| 29 echo |
| 30 pcommand pushd /tmp/drover_9999 |
| 31 echo "# Manually resolve conflicts." |
| 32 pcommand git add path/to/file_with_conflicts |
| 33 pcommand popd |
| 34 pcommand git drover --continue /tmp/drover_9999 |
| 35 echo |
| 19 echo "# A cl is uploaded to rietveld, where it can be reviewed before landing." | 36 echo "# A cl is uploaded to rietveld, where it can be reviewed before landing." |
| 20 echo | 37 echo |
| 21 echo "About to land on 9999. Continue (y/n)? y" | 38 echo "About to land on 9999. Continue (y/n)? y" |
| 22 echo "# The cherry-pick cl is landed on the branch 9999." | 39 echo "# The cherry-pick cl is landed on the branch 9999." |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1397313002:
Support merging with conflicts with git-drover. (Closed)
Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master