Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-mq.out @ 4065:8ee983e3d461

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix strip'ping the second parent of a merge
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 06 Feb 2007 15:54:58 -0200
parents 4c158de5f245
children 165abe554c80 785ad8cd1d31
comparison
equal deleted inserted replaced
4064:5d9ede002453 4065:8ee983e3d461
262 --- /dev/null 262 --- /dev/null
263 +++ b/fred 263 +++ b/fred
264 @@ -0,0 +1,1 @@ 264 @@ -0,0 +1,1 @@
265 +bar 265 +bar
266 3 barney (foo) 266 3 barney (foo)
267 % strip again
268 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
269 merging foo
270 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
271 (branch merge, don't forget to commit)
272 changeset: 3:99615015637b
273 tag: tip
274 parent: 2:20cbbe65cff7
275 parent: 1:d2871fc282d4
276 user: test
277 date: Thu Jan 01 00:00:00 1970 +0000
278 summary: merge
279
280 changeset: 2:20cbbe65cff7
281 parent: 0:53245c60e682
282 user: test
283 date: Thu Jan 01 00:00:00 1970 +0000
284 summary: change foo 2
285
286 changeset: 1:d2871fc282d4
287 user: test
288 date: Thu Jan 01 00:00:00 1970 +0000
289 summary: change foo 1
290
291 changeset: 0:53245c60e682
292 user: test
293 date: Thu Jan 01 00:00:00 1970 +0000
294 summary: add foo
295
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
297 saving bundle to
298 saving bundle to
299 adding branch
300 adding changesets
301 adding manifests
302 adding file changes
303 added 1 changesets with 1 changes to 1 files
304 (run 'hg update' to get a working copy)
305 changeset: 1:20cbbe65cff7
306 tag: tip
307 user: test
308 date: Thu Jan 01 00:00:00 1970 +0000
309 summary: change foo 2
310
311 changeset: 0:53245c60e682
312 user: test
313 date: Thu Jan 01 00:00:00 1970 +0000
314 summary: add foo
315