Mercurial > hg > gitweb

view tests/test-filebranch.out @ 2536:8106e477f584

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix new tests to be better. In particular, fix webraw test to specify a date on commit to be less brittle, and fix test-oldcgi to test fetching a subdirectory of a webdir instance.
author Eric Hopper <hopper@omnifarious.org>
date Fri, 30 Jun 2006 08:45:52 -0700
parents b2ae81a7df29
children fb493241d7f6
line wrap: on
line source

creating base
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
creating branch a
creating branch b
we shouldn't have anything but n state here
n 644          2 bar
n 644          3 baz
n 644          3 foo
n 644          2 quux
merging
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
merging for foo
resolving manifests
getting bar
merging foo
resolving foo
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
we shouldn't have anything but foo in merge state here
m 644          3 foo
main: we should have a merge here
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0      77      0       0 c36078bec30d 000000000000 000000000000
     1        77      73      1       1 182b283965f1 c36078bec30d 000000000000
     2       150      71      2       2 a6aef98656b7 c36078bec30d 000000000000
     3       221      72      3       3 0c2cc6fc80e2 182b283965f1 a6aef98656b7
log should show foo and quux changed
changeset:   3:0c2cc6fc80e2d4ee289bb658dbbe9ad932380fe9
tag:         tip
parent:      1:182b283965f1069c0112784e30e7755ad1c0dd52
parent:      2:a6aef98656b71154cae9d87408abe6d0218c8045
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
files:       foo quux
description:
merge


foo: we should have a merge here
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       0 b8e02f643373 000000000000 000000000000
     1         3       4      1       1 2ffeddde1b65 b8e02f643373 000000000000