tests/test-bheads.out
author Jesse Glick <jesse.glick@sun.com>
Fri, 25 Jan 2008 04:11:32 -0500
changeset 6150 aafdea37f796
parent 6127 25c372e8f261
child 6336 4b0c9c674707
permissions -rw-r--r--
Infer a --repository argument from command arguments when reasonable. In particular: if invoked without -R from a CWD not inside a repo, having been passed one or more file paths as command arguments, where the nearest enclosing repo of all of those paths is the same, quietly infer a -R option for that repo. Otherwise abort with an error message as before.

0: Adding root node
-------
0: Adding root node
=======
marked working directory as branch a
1: Adding a branch
-------
1: Adding a branch
=======
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
2: Adding b branch
1: Adding a branch
-------
2: Adding b branch
=======
3: Adding b branch head 1
1: Adding a branch
-------
3: Adding b branch head 1
=======
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4: Adding b branch head 2
3: Adding b branch head 1
1: Adding a branch
-------
4: Adding b branch head 2
3: Adding b branch head 1
=======
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5: Adding b branch head 3
4: Adding b branch head 2
3: Adding b branch head 1
1: Adding a branch
-------
5: Adding b branch head 3
4: Adding b branch head 2
3: Adding b branch head 1
=======
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
1: Adding a branch
-------
6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
=======
marked working directory as branch c
7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
-------
7: Adding c branch
=======
no changes on branch c containing . are reachable from 3
1
-------
7: Adding c branch
0
-------
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
0
-------
3: Adding b branch head 1
0
-------
3: Adding b branch head 1
6: Merging b branch head 2 and b branch head 3
0
-------
no changes on branch b containing . are reachable from 7
1
=======
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
-------
0: Adding root node
-------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
-------
1: Adding a branch
-------
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
-------
6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
-------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
-------
6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
-------
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
-------
6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
-------
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
-------
6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
-------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
-------
6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
-------
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7: Adding c branch
3: Adding b branch head 1
1: Adding a branch
-------
7: Adding c branch
-------
=======
1: Adding a branch
-------
6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
-------
7: Adding c branch
-------
abort: unknown revision 'z'!
-------
=======
0: Adding root node
1: Adding a branch
6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
7: Adding c branch