equal
deleted
inserted
replaced
48 $ mkdir name |
48 $ mkdir name |
49 $ echo text > name/file |
49 $ echo text > name/file |
50 $ hg st |
50 $ hg st |
51 ? name/file |
51 ? name/file |
52 $ hg up 1 |
52 $ hg up 1 |
53 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
53 abort: Directory not empty: '$TESTTMP/r1/r2/name' |
|
54 [255] |
|
55 $ cat name/file |
|
56 text |
54 $ cd .. |
57 $ cd .. |
55 |
58 |
56 #if symlink |
59 #if symlink |
57 |
60 |
58 Test update when two commits have symlinks that point to different folders |
61 Test update when two commits have symlinks that point to different folders |