equal
deleted
inserted
replaced
167 and the rebase should fail (issue5628) |
167 and the rebase should fail (issue5628) |
168 |
168 |
169 $ hg up -qC 2 |
169 $ hg up -qC 2 |
170 $ hg rebase -s 2 -d 1 --config extensions.rebase= |
170 $ hg rebase -s 2 -d 1 --config extensions.rebase= |
171 rebasing 2:e73c21d6b244 "file a/poisoned" (tip) |
171 rebasing 2:e73c21d6b244 "file a/poisoned" (tip) |
172 saved backup bundle to * (glob) |
172 abort: path 'a/poisoned' traverses symbolic link 'a' |
|
173 [255] |
173 $ ls ../merge-symlink-out |
174 $ ls ../merge-symlink-out |
174 poisoned |
|
175 |
175 |
176 $ cd .. |
176 $ cd .. |
177 |
177 |
178 Test symlink traversal on update: |
178 Test symlink traversal on update: |
179 --------------------------------- |
179 --------------------------------- |
209 audited first by calculateupdates(), where no symlink is created so both |
209 audited first by calculateupdates(), where no symlink is created so both |
210 'a' and 'a/b' are taken as good paths. still applyupdates() should fail. |
210 'a' and 'a/b' are taken as good paths. still applyupdates() should fail. |
211 |
211 |
212 $ hg up -qC null |
212 $ hg up -qC null |
213 $ hg up 1 |
213 $ hg up 1 |
214 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
214 abort: path 'a/b' traverses symbolic link 'a' |
|
215 [255] |
215 $ ls ../update-symlink-out |
216 $ ls ../update-symlink-out |
216 b |
|
217 $ rm ../update-symlink-out/b |
|
218 |
217 |
219 try branch update replacing directory with symlink, and its content: the |
218 try branch update replacing directory with symlink, and its content: the |
220 path 'a' is audited as a directory first, which should be audited again as |
219 path 'a' is audited as a directory first, which should be audited again as |
221 a symlink. |
220 a symlink. |
222 |
221 |
223 $ rm -f a |
222 $ rm -f a |
224 $ hg up -qC 2 |
223 $ hg up -qC 2 |
225 $ hg up 1 |
224 $ hg up 1 |
226 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
225 abort: path 'a/b' traverses symbolic link 'a' |
|
226 [255] |
227 $ ls ../update-symlink-out |
227 $ ls ../update-symlink-out |
228 b |
|
229 |
228 |
230 $ cd .. |
229 $ cd .. |
231 |
230 |
232 #endif |
231 #endif |