equal
deleted
inserted
replaced
126 $ hg remove sub1/.hgsubstate |
126 $ hg remove sub1/.hgsubstate |
127 $ hg status -S |
127 $ hg status -S |
128 R sub1/.hgsubstate |
128 R sub1/.hgsubstate |
129 R sub1/sub2/folder/test.txt |
129 R sub1/sub2/folder/test.txt |
130 $ hg update -Cq |
130 $ hg update -Cq |
|
131 $ touch sub1/foo |
|
132 $ hg forget sub1/sub2/folder/test.txt |
|
133 $ rm sub1/sub2/test.txt |
|
134 |
|
135 Test relative path printing + subrepos |
|
136 $ mkdir -p foo/bar |
|
137 $ cd foo |
|
138 $ touch bar/abc |
|
139 $ hg addremove -S .. |
|
140 adding ../sub1/sub2/folder/test.txt (glob) |
|
141 removing ../sub1/sub2/test.txt (glob) |
|
142 adding ../sub1/foo (glob) |
|
143 adding bar/abc (glob) |
|
144 $ cd .. |
|
145 $ hg status -S |
|
146 A foo/bar/abc |
|
147 A sub1/foo |
|
148 R sub1/sub2/test.txt |
|
149 $ hg update -Cq |
131 $ rm sub1/sub2/folder/test.txt |
150 $ rm sub1/sub2/folder/test.txt |
132 $ rm sub1/sub2/test.txt |
151 $ rm sub1/sub2/test.txt |
133 $ hg ci -ASm "remove test.txt" |
152 $ hg ci -ASm "remove test.txt" |
134 removing sub1/sub2/folder/test.txt (glob) |
153 removing sub1/sub2/folder/test.txt (glob) |
135 removing sub1/sub2/test.txt (glob) |
154 removing sub1/sub2/test.txt (glob) |
|
155 adding sub1/foo (glob) |
|
156 adding foo/bar/abc |
136 committing subrepository sub1 |
157 committing subrepository sub1 |
137 committing subrepository sub1/sub2 (glob) |
158 committing subrepository sub1/sub2 (glob) |
138 $ hg rollback -q |
159 $ hg rollback -q |
139 $ hg up -Cq |
160 $ hg up -Cq |
140 |
161 |