equal
deleted
inserted
replaced
146 --- file1 --- |
146 --- file1 --- |
147 1 |
147 1 |
148 changed |
148 changed |
149 *** file2 does not exist |
149 *** file2 does not exist |
150 |
150 |
|
151 Non-interactive linear update |
|
152 |
|
153 $ hg co -C 0 |
|
154 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
155 $ echo changed >> file1 |
|
156 $ hg rm file2 |
|
157 $ hg update 1 -y |
|
158 local changed file1 which remote deleted |
|
159 use (c)hanged version or (d)elete? c |
|
160 remote changed file2 which local deleted |
|
161 use (c)hanged version or leave (d)eleted? c |
|
162 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
163 $ status |
|
164 --- status --- |
|
165 A file1 |
|
166 C file2 |
|
167 --- file1 --- |
|
168 1 |
|
169 changed |
|
170 --- file2 --- |
|
171 2 |
|
172 changed |