|
|
foo
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
foo
|
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
(branch merge, don't forget to commit)
|
|
|
foo
|
|
|
changeset: 5:5f8fb06e083e
|
|
|
branch: foo
|
|
|
tag: tip
|
|
|
parent: 4:4909a3732169
|
|
|
parent: 3:bf1bc2f45e83
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: merge
|
|
|
|
|
|
changeset: 4:4909a3732169
|
|
|
branch: foo
|
|
|
parent: 1:b699b1cec9c2
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: modify a branch
|
|
|
|
|
|
changeset: 3:bf1bc2f45e83
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: clear branch name
|
|
|
|
|
|
changeset: 2:67ec16bde7f1
|
|
|
branch: bar
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: change branch name
|
|
|
|
|
|
changeset: 1:b699b1cec9c2
|
|
|
branch: foo
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: add branch name
|
|
|
|
|
|
changeset: 0:be8523e69bf8
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: initial
|
|
|
|
|
|
foo 5:5f8fb06e083e
|
|
|
3:bf1bc2f45e83
|
|
|
bar 2:67ec16bde7f1
|
|
|
foo
|
|
|
|
|
|
bar
|
|
|
% test for invalid branch cache
|
|
|
rolling back last transaction
|
|
|
changeset: 4:4909a3732169
|
|
|
branch: foo
|
|
|
tag: tip
|
|
|
parent: 1:b699b1cec9c2
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
summary: modify a branch
|
|
|
|
|
|
Invalid branch cache: unknown tip
|
|
|
changeset: 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f
|
|
|
branch: foo
|
|
|
tag: tip
|
|
|
parent: 1:b699b1cec9c2966b3700de4fef0dc123cd754c31
|
|
|
parent: -1:0000000000000000000000000000000000000000
|
|
|
manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a
|
|
|
user: test
|
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
|
files: a
|
|
|
extra: branch=foo
|
|
|
description:
|
|
|
modify a branch
|
|
|
|
|
|
|
|
|
4:4909a3732169
|
|
|
features: unnamed
|
|
|
4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4
|
|
|
bf1bc2f45e834c75404d0ddab57d53beab56e2f8
|
|
|
4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
|
|
|
67ec16bde7f1575d523313b9bca000f6a6f12dca bar
|
|
|
% test for different branch cache features
|
|
|
branch cache: no features specified
|
|
|
foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f
|
|
|
3:bf1bc2f45e834c75404d0ddab57d53beab56e2f8
|
|
|
bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca
|
|
|
branch cache: unknown features: dummy, foo, bar
|
|
|
foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f
|
|
|
3:bf1bc2f45e834c75404d0ddab57d53beab56e2f8
|
|
|
bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca
|
|
|
branch cache: missing features: unnamed
|
|
|
foo 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f
|
|
|
3:bf1bc2f45e834c75404d0ddab57d53beab56e2f8
|
|
|
bar 2:67ec16bde7f1575d523313b9bca000f6a6f12dca
|
|
|
% test old hg reading branch cache with feature list
|
|
|
ValueError raised correctly, good.
|
|
|
% update with no arguments: tipmost revision of the current branch
|
|
|
bf1bc2f45e83
|
|
|
4909a3732169 (foo) tip
|
|
|
|
