annotate tests/test-merge4.t @ 49621:55c6ebd11cb9 stable

tests: run many tests in $TESTTMP/repo instead of $TESTTMP This is useful so we can store other files in $TESTTMP (in particular tests that use docket files (nodemap, dirstate-v2) keep file uids in $TESTTMP/UID)
author Arseniy Alekseyev <aalekseyev@janestreet.com>
date Fri, 18 Nov 2022 13:47:29 +0000
parents fc4fb2f17dd4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
49621
55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 45895
diff changeset
1 $ hg init repo
55c6ebd11cb9 tests: run many tests in $TESTTMP/repo instead of $TESTTMP
Arseniy Alekseyev <aalekseyev@janestreet.com>
parents: 45895
diff changeset
2 $ cd repo
11977
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
3 $ echo This is file a1 > a
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
4 $ hg add a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11977
diff changeset
5 $ hg commit -m "commit #0"
11977
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
6 $ echo This is file b1 > b
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
7 $ hg add b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11977
diff changeset
8 $ hg commit -m "commit #1"
11977
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
9 $ hg update 0
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
10 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
11 $ echo This is file c1 > c
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
12 $ hg add c
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11977
diff changeset
13 $ hg commit -m "commit #2"
11977
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
14 created new head
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
15 $ hg merge 1
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
17 (branch merge, don't forget to commit)
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
18 $ rm b
db2a291e25e9 tests: unify test-merge4
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 2283
diff changeset
19 $ echo This is file c22 > c
16536
63c817ea4a70 commit: abort on merge with missing files
Patrick Mezard <patrick@mezard.eu>
parents: 12156
diff changeset
20
63c817ea4a70 commit: abort on merge with missing files
Patrick Mezard <patrick@mezard.eu>
parents: 12156
diff changeset
21 Test hg behaves when committing with a missing file added by a merge
63c817ea4a70 commit: abort on merge with missing files
Patrick Mezard <patrick@mezard.eu>
parents: 12156
diff changeset
22
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11977
diff changeset
23 $ hg commit -m "commit #3"
16536
63c817ea4a70 commit: abort on merge with missing files
Patrick Mezard <patrick@mezard.eu>
parents: 12156
diff changeset
24 abort: cannot commit merge with missing files
63c817ea4a70 commit: abort on merge with missing files
Patrick Mezard <patrick@mezard.eu>
parents: 12156
diff changeset
25 [255]
416
5e9e8b8d2629 [PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff changeset
26
44343
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
27
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
28 Test conflict*() revsets
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
29
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
30 # Bad usage
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
31 $ hg log -r 'conflictlocal(foo)'
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
32 hg: parse error: conflictlocal takes no arguments
45895
fc4fb2f17dd4 errors: use exit code 10 for parse errors
Martin von Zweigbergk <martinvonz@google.com>
parents: 44343
diff changeset
33 [10]
44343
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
34 $ hg log -r 'conflictother(foo)'
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
35 hg: parse error: conflictother takes no arguments
45895
fc4fb2f17dd4 errors: use exit code 10 for parse errors
Martin von Zweigbergk <martinvonz@google.com>
parents: 44343
diff changeset
36 [10]
44343
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
37 $ hg co -C .
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
39 # No merge parents when not merging
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
40 $ hg log -r 'conflictlocal() + conflictother()'
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
41 # No merge parents when there is no conflict
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
42 $ hg merge 1
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
44 (branch merge, don't forget to commit)
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
45 $ hg log -r 'conflictlocal() + conflictother()'
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
46 $ hg co -C .
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
47 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
48 $ echo conflict > b
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
49 $ hg ci -Aqm 'conflicting change to b'
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
50 $ hg merge 1
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
51 merging b
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
52 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
53 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
54 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
55 [1]
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
56 # Shows merge parents when there is a conflict
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
57 $ hg log -r 'conflictlocal()' -T '{rev} {desc}\n'
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
58 3 conflicting change to b
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
59 $ hg log -r 'conflictother()' -T '{rev} {desc}\n'
8561ad49915d revset: add a revset for parents in merge state
Martin von Zweigbergk <martinvonz@google.com>
parents: 16536
diff changeset
60 1 commit #1