equal
deleted
inserted
replaced
92 $ norevtest 'none clean linear' clean 4 |
92 $ norevtest 'none clean linear' clean 4 |
93 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
93 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
94 parent=5 |
94 parent=5 |
95 |
95 |
96 $ norevtest 'none clean same' clean 2 |
96 $ norevtest 'none clean same' clean 2 |
97 abort: crosses branches (merge branches or update --check to force update) |
97 abort: not a linear update |
|
98 (merge or update --check to force update) |
98 parent=2 |
99 parent=2 |
99 |
100 |
100 |
101 |
101 $ revtest 'none clean linear' clean 1 2 |
102 $ revtest 'none clean linear' clean 1 2 |
102 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
103 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |