Show More
@@ -83,10 +83,6 b'' | |||
|
83 | 83 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
84 | 84 | summary: 1 |
|
85 | 85 | |
|
86 | $ hg --debug merge | |
|
87 | abort: nothing to merge | |
|
88 | (use 'hg update' instead) | |
|
89 | [255] | |
|
90 | 86 | $ hg parents |
|
91 | 87 | changeset: 0:c19d34741b0a |
|
92 | 88 | user: test |
@@ -170,52 +166,6 b' create a second head' | |||
|
170 | 166 | abort: uncommitted changes |
|
171 | 167 | (commit and merge, or update --clean to discard changes) |
|
172 | 168 | [255] |
|
173 | $ hg --debug merge | |
|
174 | abort: uncommitted changes | |
|
175 | (use 'hg status' to list changes) | |
|
176 | [255] | |
|
177 | $ hg --debug merge -f | |
|
178 | searching for copies back to rev 1 | |
|
179 | unmatched files new in both: | |
|
180 | b | |
|
181 | resolving manifests | |
|
182 | branchmerge: True, force: True, partial: False | |
|
183 | ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 | |
|
184 | preserving a for resolve of a | |
|
185 | preserving b for resolve of b | |
|
186 | a: versions differ -> m | |
|
187 | updating: a 1/2 files (50.00%) | |
|
188 | picked tool 'true' for a (binary False symlink False) | |
|
189 | merging a | |
|
190 | my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a | |
|
191 | b: both created -> m | |
|
192 | updating: b 2/2 files (100.00%) | |
|
193 | picked tool 'true' for b (binary False symlink False) | |
|
194 | merging b | |
|
195 | my b@1e71731e6fbb+ other b@83c51d0caff4 ancestor b@000000000000 | |
|
196 | 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
|
197 | (branch merge, don't forget to commit) | |
|
198 | $ hg parents | |
|
199 | changeset: 1:1e71731e6fbb | |
|
200 | user: test | |
|
201 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
202 | summary: 2 | |
|
203 | ||
|
204 | changeset: 2:83c51d0caff4 | |
|
205 | tag: tip | |
|
206 | parent: 0:c19d34741b0a | |
|
207 | user: test | |
|
208 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
209 | summary: 3 | |
|
210 | ||
|
211 | $ hg diff --nodates | |
|
212 | diff -r 1e71731e6fbb a | |
|
213 | --- a/a | |
|
214 | +++ b/a | |
|
215 | @@ -1,1 +1,1 @@ | |
|
216 | -a2 | |
|
217 | +abc | |
|
218 | ||
|
219 | 169 | |
|
220 | 170 | test a local add |
|
221 | 171 |
General Comments 0
You need to be logged in to leave comments.
Login now