equal
deleted
inserted
replaced
141 $ hg status -A |
141 $ hg status -A |
142 C a |
142 C a |
143 $ hg update -q -C 3 |
143 $ hg update -q -C 3 |
144 $ hg update -q 0 |
144 $ hg update -q 0 |
145 |
145 |
|
146 $ hg up -C -r 2 |
|
147 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
148 $ hg mv A a |
|
149 $ hg diff -g > rename.diff |
|
150 $ hg ci -m 'A -> a' |
|
151 $ hg up -q '.^' |
|
152 $ hg import rename.diff -m "import rename A -> a" |
|
153 applying rename.diff |
|
154 $ hg st |
|
155 ? rename.diff |
|
156 $ hg files |
|
157 a |
|
158 $ find * | sort |
|
159 a |
|
160 rename.diff |
|
161 |
|
162 $ rm rename.diff |
|
163 |
146 $ cd .. |
164 $ cd .. |
147 |
165 |
148 issue 3342: file in nested directory causes unexpected abort |
166 issue 3342: file in nested directory causes unexpected abort |
149 |
167 |
150 $ hg init issue3342 |
168 $ hg init issue3342 |