equal
deleted
inserted
replaced
45 |
45 |
46 $ hg update -q 'desc("add inside and outside")' |
46 $ hg update -q 'desc("add inside and outside")' |
47 $ hg update -q 'desc("modify inside")' |
47 $ hg update -q 'desc("modify inside")' |
48 $ find * |
48 $ find * |
49 inside |
49 inside |
50 inside/f1 (glob) |
50 inside/f1 |
51 $ cat inside/f1 |
51 $ cat inside/f1 |
52 modified |
52 modified |
53 |
53 |
54 Can update to revision with changes outside |
54 Can update to revision with changes outside |
55 |
55 |
56 $ hg update -q 'desc("modify outside")' |
56 $ hg update -q 'desc("modify outside")' |
57 $ find * |
57 $ find * |
58 inside |
58 inside |
59 inside/f1 (glob) |
59 inside/f1 |
60 $ cat inside/f1 |
60 $ cat inside/f1 |
61 modified |
61 modified |
62 |
62 |
63 Can update with a deleted file inside |
63 Can update with a deleted file inside |
64 |
64 |