tests/test-up-local-change.out
changeset 388 398737777644
parent 382 37249c522770
child 396 8f8bb77d560e
equal deleted inserted replaced
387:c07c6fb2f0a8 388:398737777644
    38 + hg -d up -m
    38 + hg -d up -m
    39 resolving manifests
    39 resolving manifests
    40  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
    40  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
    41 + hg parents
    41 + hg parents
    42 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
    42 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
       
    43 tag:         tip
    43 user:        test
    44 user:        test
    44 date:        Thu Jan  1 00:00:00 1970
    45 date:        Thu Jan  1 00:00:00 1970
    45 summary:     2
    46 summary:     2
    46 
    47 
    47 + hg -v history
    48 + hg -v history
    48 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
    49 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
       
    50 tag:         tip
    49 manifest:    1:1165e8bd193e17ad7d321d846fcf27ff3f412758
    51 manifest:    1:1165e8bd193e17ad7d321d846fcf27ff3f412758
    50 user:        test
    52 user:        test
    51 date:        Thu Jan  1 00:00:00 1970
    53 date:        Thu Jan  1 00:00:00 1970
    52 files:       a b
    54 files:       a b
    53 description:
    55 description: