3 created new head |
3 created new head |
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
5 created new head |
5 created new head |
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7 % should fail because not at a head |
7 % should fail because not at a head |
8 abort: repo has 3 heads - please merge with an explicit rev |
8 abort: branch 'default' has 3 heads - please merge with an explicit rev |
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
10 % should fail because > 2 heads |
10 % should fail because > 2 heads |
11 abort: repo has 3 heads - please merge with an explicit rev |
11 abort: branch 'default' has 3 heads - please merge with an explicit rev |
12 % should succeed |
12 % should succeed |
13 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
13 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14 (branch merge, don't forget to commit) |
14 (branch merge, don't forget to commit) |
15 % should succeed - 2 heads |
15 % should succeed - 2 heads |
16 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |