Mercurial > hg
annotate tests/test-merge5.t @ 25480:d410336fdb3c
push: make pushkey part advisory
The current behavior (with bundle1) is to let the rest of the push succeed if
the pushkey call (phases, bookmarks) failed (this comes from the fact that each
item is sent in its own command).
We kept this behavior with bundle2, which is highly debatable, but let us keep
thing as they are now as a start. We are about to enforce 'mandatory' pushkey
part as 'mandatory' successful, so we need to marks parts as advisory to
preserve the current (debatable) behavior.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Wed, 27 May 2015 05:35:00 -0700 |
parents | fe80fdf68ba7 |
children | 72072cfc7e91 |
rev | line source |
---|---|
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
1 $ hg init |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
2 $ echo This is file a1 > a |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
3 $ echo This is file b1 > b |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
4 $ hg add a b |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
5 $ hg commit -m "commit #0" |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
6 $ echo This is file b22 > b |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
7 $ hg commit -m "comment #1" |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
8 $ hg update 0 |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
10 $ rm b |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
11 $ hg commit -A -m "comment #2" |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
12 removing b |
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
13 created new head |
12154
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
14 $ hg update 1 |
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
16 $ hg update |
19798
76df01e56e7f
update: improve error message for clean non-linear update
Siddharth Agarwal <sid0@fb.com>
parents:
17849
diff
changeset
|
17 abort: not a linear update |
76df01e56e7f
update: improve error message for clean non-linear update
Siddharth Agarwal <sid0@fb.com>
parents:
17849
diff
changeset
|
18 (merge or update --check to force update) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12155
diff
changeset
|
19 [255] |
17849
6da47b655d97
update: check for missing files with --check (issue3595)
Matt Mackall <mpm@selenic.com>
parents:
14485
diff
changeset
|
20 $ rm b |
6da47b655d97
update: check for missing files with --check (issue3595)
Matt Mackall <mpm@selenic.com>
parents:
14485
diff
changeset
|
21 $ hg update -c |
19801
41abe2e3e3b7
update: standardize error message for dirty update --check
Siddharth Agarwal <sid0@fb.com>
parents:
19799
diff
changeset
|
22 abort: uncommitted changes |
17849
6da47b655d97
update: check for missing files with --check (issue3595)
Matt Mackall <mpm@selenic.com>
parents:
14485
diff
changeset
|
23 [255] |
6da47b655d97
update: check for missing files with --check (issue3595)
Matt Mackall <mpm@selenic.com>
parents:
14485
diff
changeset
|
24 $ hg revert b |
12154
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
25 $ hg update -c |
c85e07a2d783
test-merge5: ensure updating to tip across branches is tested
Brodie Rao <brodie@bitheap.org>
parents:
11978
diff
changeset
|
26 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
27 $ mv a c |
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
28 |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
29 Should abort: |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
30 |
23026
fe80fdf68ba7
test-merge5: remove obsolete '-y' and its motivating comment
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
19801
diff
changeset
|
31 $ hg update 1 |
19799
ab3e42225dbc
update: add error message for dirty non-linear update with no rev
Siddharth Agarwal <sid0@fb.com>
parents:
19798
diff
changeset
|
32 abort: uncommitted changes |
ab3e42225dbc
update: add error message for dirty non-linear update with no rev
Siddharth Agarwal <sid0@fb.com>
parents:
19798
diff
changeset
|
33 (commit or update --clean to discard changes) |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12155
diff
changeset
|
34 [255] |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
35 $ mv c a |
12155
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
36 |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
37 Should succeed: |
94ad12aa0530
test-merge5: removed unnecessary parts of test
Martin Geisler <mg@lazybytes.net>
parents:
12154
diff
changeset
|
38 |
23026
fe80fdf68ba7
test-merge5: remove obsolete '-y' and its motivating comment
Martin von Zweigbergk <martinvonz@gmail.com>
parents:
19801
diff
changeset
|
39 $ hg update 1 |
11978
ef4a1ffbf519
tests: unify test-merge5
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
6350
diff
changeset
|
40 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |