##// END OF EJS Templates
Merge with stable
Merge with stable

File last commit:

r11543:0a2762d8 stable
r11766:a65ea282 merge default
Show More
test-bheads.out
209 lines | 5.3 KiB | text/plain | TextLexer
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
marked working directory as branch a
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 1: Adding a branch (a)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 2: Adding b branch (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 2: Adding b branch (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 3: Adding b branch head 1 (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 4: Adding b branch head 2 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 4: Adding b branch head 2 (b)
3: Adding b branch head 1 (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 5: Adding b branch head 3 (b)
4: Adding b branch head 2 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 5: Adding b branch head 3 (b)
4: Adding b branch head 2 (b)
3: Adding b branch head 1 (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
marked working directory as branch c
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 =======
Dirkjan Ochtman
commands: don't do too much work for error messages
r10346 no open branch heads found on branches c (started at 3)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 1
-------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 0
-------
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
0
-------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 3: Adding b branch head 1 (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 0
-------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 0
-------
Dirkjan Ochtman
commands: don't do too much work for error messages
r10346 no open branch heads found on branches b (started at 7)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 1
=======
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 1: Adding a branch (a)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
=======
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 1: Adding a branch (a)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
Eric Hopper
Add option to heads to show only heads for current branch.
r4648 -------
abort: unknown revision 'z'!
-------
=======
Dirkjan Ochtman
commands: do all branch heads by default, demote topological to -t/--topo
r10350 7: Adding c branch (c)
6: Merging b branch head 2 and b branch head 3 (b)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
0: Adding root node ()
% topological heads
7: Adding c branch (c)
3: Adding b branch head 1 (b)
1: Adding a branch (a)
Gilles Moris
commit: add tests for the 'created new head' message
r11318 ______________
% created new head message
% init: no msg
adding a
marked working directory as branch b
adding b
% case NN: msg
marked working directory as branch b
Nicolas Dumazet
test-bheads: use a case-insensitive set of filenames (issue2274)...
r11543 adding bb
Gilles Moris
commit: add tests for the 'created new head' message
r11318 created new head
% case HN: no msg
% case BN: msg
marked working directory as branch default
Nicolas Dumazet
test-bheads: use a case-insensitive set of filenames (issue2274)...
r11543 adding aa
Gilles Moris
commit: add tests for the 'created new head' message
r11318 created new head
% case CN: msg
Nicolas Dumazet
test-bheads: use a case-insensitive set of filenames (issue2274)...
r11543 adding bbb
Gilles Moris
commit: add tests for the 'created new head' message
r11318 created new head
% case BB: msg
marked working directory as branch default
created new head
% case CB: msg
created new head
% case HB: no msg
% case CC: msg
created new head
% case CH: no msg
% case HH: no msg