tests/test-up-local-change.out
changeset 784 853bfbf1a312
parent 775 122449dd89db
child 793 445970ccf57a
child 808 8f5637f0a0c0
child 814 0902ffece4b4
equal deleted inserted replaced
783:4b06fc1c0f26 784:853bfbf1a312
    40 + hg --debug up -m
    40 + hg --debug up -m
    41 resolving manifests
    41 resolving manifests
    42  force None allow 1 moddirstate True linear True
    42  force None allow 1 moddirstate True linear True
    43  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
    43  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
    44 + hg parents
    44 + hg parents
    45 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
    45 changeset:   1:1e71731e6fbb
    46 tag:         tip
    46 tag:         tip
    47 user:        test
    47 user:        test
    48 date:        Thu Jan  1 00:00:00 1970
    48 date:        Thu Jan  1 00:00:00 1970
    49 summary:     2
    49 summary:     2
    50 
    50 
    51 + hg -v history
    51 + hg -v history
    52 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
    52 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
    53 tag:         tip
    53 tag:         tip
    54 manifest:    1:1165e8bd193e17ad7d321d846fcf27ff3f412758
       
    55 user:        test
    54 user:        test
    56 date:        Thu Jan  1 00:00:00 1970
    55 date:        Thu Jan  1 00:00:00 1970
    57 files:       a b
    56 files:       a b
    58 description:
    57 description:
    59 2
    58 2
    60 
    59 
    61 
    60 
    62 changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
    61 changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
    63 manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
       
    64 user:        test
    62 user:        test
    65 date:        Thu Jan  1 00:00:00 1970
    63 date:        Thu Jan  1 00:00:00 1970
    66 files:       a
    64 files:       a
    67 description:
    65 description:
    68 1
    66 1