Mercurial > hg
comparison tests/test-convert-git.t @ 48278:fd3d4b7f8e62
tests: fix test-convert-git to work w/ "git pull" requiring strategy
A recent change to git (031e2f7ae195) made it an error to not specify a strategy
(`--rebase`, `--no-rebase`, `--ff-only`), instead of just the warning it was
previously. As far as I can tell, `--no-rebase` is the behavior we were getting
before, and the only one that makes the test work.
Differential Revision: https://phab.mercurial-scm.org/D11714
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Tue, 19 Oct 2021 18:06:07 -0700 |
parents | 9dc1351d0b5f |
children | 9987d14ad63f |
comparison
equal
deleted
inserted
replaced
48277:96aa3a68d3b5 | 48278:fd3d4b7f8e62 |
---|---|
48 $ git checkout -b other HEAD~ >/dev/null 2>/dev/null | 48 $ git checkout -b other HEAD~ >/dev/null 2>/dev/null |
49 $ echo c > a | 49 $ echo c > a |
50 $ echo a >> a | 50 $ echo a >> a |
51 $ commit -a -m t4.2 | 51 $ commit -a -m t4.2 |
52 $ git checkout master >/dev/null 2>/dev/null | 52 $ git checkout master >/dev/null 2>/dev/null |
53 $ git pull --no-commit . other > /dev/null 2>/dev/null | 53 $ git pull --no-commit . other --no-rebase > /dev/null 2>/dev/null |
54 $ commit -m 'Merge branch other' | 54 $ commit -m 'Merge branch other' |
55 $ cd .. | 55 $ cd .. |
56 $ hg convert --config extensions.progress= --config progress.assume-tty=1 \ | 56 $ hg convert --config extensions.progress= --config progress.assume-tty=1 \ |
57 > --config progress.delay=0 --config progress.changedelay=0 \ | 57 > --config progress.delay=0 --config progress.changedelay=0 \ |
58 > --config progress.refresh=0 --config progress.width=60 \ | 58 > --config progress.refresh=0 --config progress.width=60 \ |
135 $ git checkout -b Baz HEAD~ >/dev/null 2>/dev/null | 135 $ git checkout -b Baz HEAD~ >/dev/null 2>/dev/null |
136 $ echo baz > baz | 136 $ echo baz > baz |
137 $ git add baz | 137 $ git add baz |
138 $ commit -a -m 'add baz' | 138 $ commit -a -m 'add baz' |
139 $ git checkout master >/dev/null 2>/dev/null | 139 $ git checkout master >/dev/null 2>/dev/null |
140 $ git pull --no-commit . Bar Baz > /dev/null 2>/dev/null | 140 $ git pull --no-commit . Bar Baz --no-rebase > /dev/null 2>/dev/null |
141 $ commit -m 'Octopus merge' | 141 $ commit -m 'Octopus merge' |
142 $ echo bar >> bar | 142 $ echo bar >> bar |
143 $ commit -a -m 'change bar' | 143 $ commit -a -m 'change bar' |
144 $ git checkout -b Foo HEAD~ >/dev/null 2>/dev/null | 144 $ git checkout -b Foo HEAD~ >/dev/null 2>/dev/null |
145 $ echo >> foo | 145 $ echo >> foo |
146 $ commit -a -m 'change foo' | 146 $ commit -a -m 'change foo' |
147 $ git checkout master >/dev/null 2>/dev/null | 147 $ git checkout master >/dev/null 2>/dev/null |
148 $ git pull --no-commit -s ours . Foo > /dev/null 2>/dev/null | 148 $ git pull --no-commit -s ours . Foo --no-rebase > /dev/null 2>/dev/null |
149 $ commit -m 'Discard change to foo' | 149 $ commit -m 'Discard change to foo' |
150 $ cd .. | 150 $ cd .. |
151 $ glog() | 151 $ glog() |
152 > { | 152 > { |
153 > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@" | 153 > hg log -G --template '{rev} "{desc|firstline}" files: {files}\n' "$@" |