Mercurial > hg
annotate tests/test-commit-unresolved.t @ 48393:1a8a70b4b0ad
dirstate: cleanup remaining of "now" during write
Since the whole `need_delay` have been removed, we no longer need this.
Differential Revision: https://phab.mercurial-scm.org/D11797
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 19 Nov 2021 03:03:01 +0100 |
parents | fa87536d3d70 |
children |
rev | line source |
---|---|
42600
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
1 #testcases abortcommand abortflag |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
2 #if abortflag |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
3 $ cat >> $HGRCPATH <<EOF |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
4 > [alias] |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
5 > abort = merge --abort |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
6 > EOF |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
7 #endif |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
8 |
11804
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
9 $ addcommit () { |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
10 > echo $1 > $1 |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
11 > hg add $1 |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
12 > hg commit -d "${2} 0" -m $1 |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
13 > } |
6888
7c36a4fb05a3
make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
14 |
11804
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
15 $ commit () { |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
16 > hg commit -d "${2} 0" -m $1 |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
17 > } |
6910 | 18 |
11804
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
19 $ hg init a |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
20 $ cd a |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
21 $ addcommit "A" 0 |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
22 $ addcommit "B" 1 |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
23 $ echo "C" >> A |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
24 $ commit "C" 2 |
6888
7c36a4fb05a3
make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
25 |
11804
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
26 $ hg update -C 0 |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
27 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
28 $ echo "D" >> A |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
29 $ commit "D" 3 |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
30 created new head |
6888
7c36a4fb05a3
make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
31 |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
32 State before the merge |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
33 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
34 $ hg status |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
35 $ hg id |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
36 e45016d2b3d3 tip |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
37 $ hg summary |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
38 parent: 3:e45016d2b3d3 tip |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
39 D |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
40 branch: default |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
41 commit: (clean) |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
42 update: 2 new changesets, 2 branch heads (merge) |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
43 phases: 4 draft |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
44 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
45 Testing the abort functionality first in case of conflicts |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
46 |
42600
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
47 $ hg abort |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
48 abort: no merge in progress (abortflag !) |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
49 abort: no operation in progress (abortcommand !) |
45840
527ce85c2e60
errors: introduce StateError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
45827
diff
changeset
|
50 [20] |
42600
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
51 |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
52 $ hg merge |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
53 merging A |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
54 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
55 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
56 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
57 [1] |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
58 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
59 $ hg merge --abort e4501 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
60 abort: cannot specify a node with --abort |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44174
diff
changeset
|
61 [10] |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
62 $ hg merge --abort --rev e4501 |
44174
75c2ca094d3a
merge: use check_incompatible_arguments() for --abort
Martin von Zweigbergk <martinvonz@google.com>
parents:
42600
diff
changeset
|
63 abort: cannot specify both --abort and --rev |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44174
diff
changeset
|
64 [10] |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
65 |
42600
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
66 #if abortcommand |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
67 when in dry-run mode |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
68 $ hg abort --dry-run |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
69 merge in progress, will be aborted |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
70 #endif |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
71 |
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
72 $ hg abort |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
73 aborting the merge, updating back to e45016d2b3d3 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
74 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
75 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
76 Checking that we got back in the same state |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
77 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
78 $ hg status |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
79 ? A.orig |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
80 $ hg id |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
81 e45016d2b3d3 tip |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
82 $ hg summary |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
83 parent: 3:e45016d2b3d3 tip |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
84 D |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
85 branch: default |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
86 commit: 1 unknown (clean) |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
87 update: 2 new changesets, 2 branch heads (merge) |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
88 phases: 4 draft |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
89 |
11804
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
90 Merging a conflict araises |
6888
7c36a4fb05a3
make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
91 |
11804
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
92 $ hg merge |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
93 merging A |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
23917
diff
changeset
|
94 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
11804
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
95 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
96 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12314
diff
changeset
|
97 [1] |
11804
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
98 |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
99 Correct the conflict without marking the file as resolved |
6888
7c36a4fb05a3
make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
100 |
11804
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
101 $ echo "ABCD" > A |
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
102 $ hg commit -m "Merged" |
29975
c15f06109b7a
localrepo: use single quotes in use warning
timeless <timeless@mozdev.org>
parents:
27102
diff
changeset
|
103 abort: unresolved merge conflicts (see 'hg help resolve') |
45916
fa87536d3d70
errors: raise StateError when there are unresolves merge conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
45840
diff
changeset
|
104 [20] |
6888
7c36a4fb05a3
make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
105 |
11804
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
106 Mark the conflict as resolved and commit |
6888
7c36a4fb05a3
make commit fail when committing unresolved files
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
107 |
11804
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
108 $ hg resolve -m A |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21267
diff
changeset
|
109 (no more unresolved files) |
11804
6c24465613de
tests: unify test-commit-unresolved
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8168
diff
changeset
|
110 $ hg commit -m "Merged" |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
111 |
27102
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
112 Test that if a file is removed but not marked resolved, the commit still fails |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
113 (issue4972) |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
114 |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
115 $ hg up ".^" |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
116 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
117 $ hg merge 2 |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
118 merging A |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
119 warning: conflicts while merging A! (edit, then use 'hg resolve --mark') |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
120 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
121 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
27102
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
122 [1] |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
123 $ hg rm --force A |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
124 $ hg commit -m merged |
29975
c15f06109b7a
localrepo: use single quotes in use warning
timeless <timeless@mozdev.org>
parents:
27102
diff
changeset
|
125 abort: unresolved merge conflicts (see 'hg help resolve') |
45916
fa87536d3d70
errors: raise StateError when there are unresolves merge conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
45840
diff
changeset
|
126 [20] |
27102
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
127 |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
128 $ hg resolve -ma |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
129 (no more unresolved files) |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
130 $ hg commit -m merged |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
131 created new head |
f97bb61b51e6
localrepo.commit: check all files for resolve state (issue4972)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
132 |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
133 Testing the abort functionality in case of no conflicts |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
134 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
135 $ hg update -C 0 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
136 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
137 $ addcommit "E" 4 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
138 created new head |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
139 $ hg id |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
140 68352a18a7c4 tip |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
141 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
142 $ hg merge -r 4 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
143 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
144 (branch merge, don't forget to commit) |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
145 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
146 $ hg merge --preview --abort |
44174
75c2ca094d3a
merge: use check_incompatible_arguments() for --abort
Martin von Zweigbergk <martinvonz@google.com>
parents:
42600
diff
changeset
|
147 abort: cannot specify both --abort and --preview |
45827
8d72e29ad1e0
errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
44174
diff
changeset
|
148 [10] |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
149 |
42600
3bc400ccbf99
abort: added support for merge
Taapas Agrawal <taapas2897@gmail.com>
parents:
35704
diff
changeset
|
150 $ hg abort |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
151 aborting the merge, updating back to 68352a18a7c4 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
152 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
153 |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
154 $ hg id |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
155 68352a18a7c4 tip |
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
29975
diff
changeset
|
156 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15501
diff
changeset
|
157 $ cd .. |