Mercurial > hg
annotate tests/test-absorb-unfinished.t @ 45684:0c18493287f5
tests: set git config using `git config` for simplicity
I also took the liberty to not set the same config value twice as we
did before.
Differential Revision: https://phab.mercurial-scm.org/D9176
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 08 Oct 2020 13:19:18 -0700 |
parents | a253ded5b03d |
children | f90a5c211251 |
rev | line source |
---|---|
42128
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
1 $ cat >> $HGRCPATH << EOF |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
2 > [extensions] |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
3 > absorb= |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
4 > EOF |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
5 |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
6 Abort absorb if there is an unfinished operation. |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
7 |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
8 $ hg init abortunresolved |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
9 $ cd abortunresolved |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
10 |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
11 $ echo "foo1" > foo.whole |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
12 $ hg commit -Aqm "foo 1" |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
13 |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
14 $ hg update null |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
15 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
16 $ echo "foo2" > foo.whole |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
17 $ hg commit -Aqm "foo 2" |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
18 |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
19 $ hg --config extensions.rebase= rebase -r 1 -d 0 |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
20 rebasing 1:c3b6dc0e177a "foo 2" (tip) |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
21 merging foo.whole |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
22 warning: conflicts while merging foo.whole! (edit, then use 'hg resolve --mark') |
45150
dc5e5577af39
error: unify the error message formats for 'rebase' and 'unshelve'
Daniel Ploch <dploch@google.com>
parents:
42128
diff
changeset
|
23 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
42128
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
24 [1] |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
25 |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
26 $ hg --config extensions.rebase= absorb |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
27 abort: rebase in progress |
45215
a253ded5b03d
morestatus: mention --stop even if not using --verbose
Kyle Lippincott <spectral@google.com>
parents:
45150
diff
changeset
|
28 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |
42128
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
29 [255] |
537a8aeb9977
absorb: aborting if another operation is in progress
Rodrigo Damazio Bovendorp <rdamazio@google.com>
parents:
diff
changeset
|
30 |