##// END OF EJS Templates
test-resolve: add tests for re-merge
Martin von Zweigbergk -
r23023:63c9088b default
parent child Browse files
Show More
@@ -99,6 +99,45 b' BROKEN: resolve -m should do nothing in '
99 99 abort: resolve command not applicable when not merging
100 100 [255]
101 101
102 get back to conflicting state
103
104 $ hg up -qC 2
105 $ hg merge --tool=internal:fail 1
106 0 files updated, 0 files merged, 0 files removed, 2 files unresolved
107 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
108 [1]
109
110 resolve without arguments should suggest --all
111 $ hg resolve
112 abort: no files or directories specified
113 (use --all to remerge all files)
114 [255]
115
116 resolve --all should re-merge all unresolved files
117 $ hg resolve -q --all
118 warning: conflicts during merge.
119 merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
120 warning: conflicts during merge.
121 merging file2 incomplete! (edit conflicts, then use 'hg resolve --mark')
122 [1]
123 $ grep -q '<<<' file1
124 $ grep -q '<<<' file2
125
126 resolve <file> should re-merge file
127 $ echo resolved > file1
128 $ hg resolve -q file1
129 warning: conflicts during merge.
130 merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
131 [1]
132 $ grep -q '<<<' file1
133
134 resolve <file> should do nothing if 'file' was marked resolved
135 $ echo resolved > file1
136 $ hg resolve -m file1
137 $ hg resolve -q file1
138 $ cat file1
139 resolved
140
102 141 test crashed merge with empty mergestate
103 142
104 143 $ hg up -qC 1
General Comments 0
You need to be logged in to leave comments. Login now