aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
main
chrome/4147
chrome/3987
chrome/3865
chrome/3904
infra/config
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '29d5e56cd5'
${ noResults }
depot_tools/tests
History
sdefresne@chromium.org d421f6a477 Fix "git rebase-update" when multiple branch are stale. 
Fix a bug that left branches tracking a dead branch if both their parent
and grand-parent were left with no changes after a "rebase-update" step.

Given the following initial state:
  $ git map-branches -v
  origin/master
    a
      b
        c *        [ ahead 1 ]

without this patch, a "git rebase-update" on this tree state would
leave the branch "c" as tracking a non-existing branch "a":

  $ git recursive-rebase
  a up-to-date
  b up-to-date
  c up-to-date
  Reparented c to track a (was tracking b)
  Deleted branch b (was 448d1da).
  Deleted branch a (was 448d1da).
  $ git map-branches -v
  {a:GONE}
    c *

with the patch, we record that the branch "c" is tracking must be
updated twice and we end up in a state were "c" is correctly tracking
"origin/master":

  $ git recursive-rebase
  a up-to-date
  b up-to-date
  c up-to-date
  Reparented c to track origin/master (was tracking b)
  Deleted branch b (was 448d1da).
  Deleted branch a (was 448d1da).
  $ git map-branches -v
  origin/master
    c *            [ ahead 1 ]

BUG=456806

Review URL: https://codereview.chromium.org/1482753002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297792 0039d316-1c4b-4281-b951-d872f2087c98
 		10 years ago
..
gstools Scripts to download files from google storage based on sha1 sums 13 years ago
subversion_config
…
abandon.sh Enable OAuth2 by default. 11 years ago
basic.sh Make 'git cl status' report the current branch even if there's no active CL. 10 years ago
breakpad_unittest.py Make sure that direct call to SendStack() doesn't send a stack trace for non googler 14 years ago
checkout_test.py Remove most svn related testing. 11 years ago
download_from_google_storage_unittests.py Reland 0c7d94eb9d9fa388bda0d74405c0928dceea22ff: Add support for tar.gz archive files to download from download_from_google_storage 10 years ago
fix_encoding_test.py
…
gclient_scm_test.py Remove most svn related testing. 11 years ago
gclient_smoketest.py Revert of git_cl/gclient: use python2 (patchset #3 id:40001 of https://codereview.chromium.org/1437773002/ ) 10 years ago
gclient_test.py The original assertions trigger pylint unreachable warnings, and they are replaced by fail() calls. 11 years ago
gclient_utils_test.py Make it possible to refer to github-style URLs. 12 years ago
git_cache_test.py Allow 'git cache fetch' to re-bootstrap. 10 years ago
git_cl_test.py Add a space before period in review URL 10 years ago
git_common_test.py Add a git-drover. 10 years ago
git_drover_test.py Support merging with conflicts with git-drover. 10 years ago
git_footers_test.py Added git footers tool to parse conventional metadata from git commits 11 years ago
git_number_test.py Disable tests that break because of git 2.4 11 years ago
git_rebase_update_test.py Fix "git rebase-update" when multiple branch are stale. 10 years ago
gsutil_test.py gsutil: Parallel-safe, specify target, add clean. 10 years ago
hooks.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 12 years ago
owners.sh Enable OAuth2 by default. 11 years ago
owners_finder_test.py An interactive tool to help find owners covering current change list. 12 years ago
owners_unittest.py Implement support for file: includes in OWNERS files. 11 years ago
patch.sh Enable OAuth2 by default. 11 years ago
patch_test.py Fix applying svn:executable on Windows. 13 years ago
post-dcommit-hook-test.sh Enable OAuth2 by default. 11 years ago
presubmit_unittest.py Remove unused CheckSvnModifiedDirectories. 10 years ago
push-basic.sh Make 'git cl status' report the current branch even if there's no active CL. 10 years ago
push-from-logs.sh Enable OAuth2 by default. 11 years ago
rename.sh Enable OAuth2 by default. 11 years ago
rietveld_test.py rietveld.py: Change three_state_keys to emit "True" or "False" query params rather than 1/2. 10 years ago
sample_pre_commit_hook
…
save-description-on-failure.sh Enable OAuth2 by default. 11 years ago
scm_unittest.py Remove most svn related testing. 11 years ago
submit-from-new-dir.sh Enable OAuth2 by default. 11 years ago
submodule-merge-test.sh Enable OAuth2 by default. 11 years ago
subprocess2_test.py Fix many (but not all[1]) depot_tools tests on Windows. 13 years ago
test-lib.sh Fix test failures on Ubuntu/Trusty. 11 years ago
trychange_unittest.py trychange.py: Gerrit protocol 12 years ago
upload-local-tracking-branch.sh Enable OAuth2 by default. 11 years ago
upload-stale.sh Enable OAuth2 by default. 11 years ago
upload_to_google_storage_unittests.py Reland 0c7d94eb9d9fa388bda0d74405c0928dceea22ff: Add support for tar.gz archive files to download from download_from_google_storage 10 years ago
upstream.sh Invoke the bash shell via /usr/bin/env so that these scripts run on operating systems without /bin/bash too. 12 years ago
watchlists_unittest.py
…