author | Barret Rennie <barret@brennie.ca> |
Sat, 31 Oct 2020 17:42:31 -0400 | |
branch | stable |
changeset 45801 | 91c41ea14598 |
parent 26420 | 2fc86d92c4a9 |
child 49621 | 55c6ebd11cb9 |
permissions | -rw-r--r-- |
26420
2fc86d92c4a9
urls: bulk-change BTS urls to new location
Matt Mackall <mpm@selenic.com>
parents:
23413
diff
changeset
|
1 |
https://bz.mercurial-scm.org/619 |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
2 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
3 |
$ hg init |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
4 |
$ echo a > a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
5 |
$ hg ci -Ama |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
6 |
adding a |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
7 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
8 |
$ echo b > b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
9 |
$ hg branch b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
10 |
marked working directory as branch b |
15615 | 11 |
(branches are permanent and global, did you want a bookmark?) |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
12 |
$ hg ci -Amb |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
13 |
adding b |
4748
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
15 |
$ hg co -C 0 |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
16 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
17 |
|
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
18 |
Fast-forward: |
4748
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
19 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
20 |
$ hg merge b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
21 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
22 |
(branch merge, don't forget to commit) |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
23 |
$ hg ci -Ammerge |
4748
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
24 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
25 |
Bogus fast-forward should fail: |
4748
8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
26 |
|
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
27 |
$ hg merge b |
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
28 |
abort: merging with a working directory ancestor has no effect |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12195
diff
changeset
|
29 |
[255] |
12195
ee41be2bbf5a
tests: unify test-issue*
Adrian Buehlmann <adrian@cadifra.com>
parents:
12156
diff
changeset
|
30 |
|
23413
0c432696dae3
revset: fix first and last for generatorset (issue4465)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
15615
diff
changeset
|
31 |
Even with strange revset (issue4465) |
0c432696dae3
revset: fix first and last for generatorset (issue4465)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
15615
diff
changeset
|
32 |
|
0c432696dae3
revset: fix first and last for generatorset (issue4465)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
15615
diff
changeset
|
33 |
$ hg merge ::. |
0c432696dae3
revset: fix first and last for generatorset (issue4465)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
15615
diff
changeset
|
34 |
abort: merging with a working directory ancestor has no effect |
0c432696dae3
revset: fix first and last for generatorset (issue4465)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
15615
diff
changeset
|
35 |
[255] |
0c432696dae3
revset: fix first and last for generatorset (issue4465)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
15615
diff
changeset
|
36 |