Mercurial > hg > mercurial-source

comparison tests/test-subrepo-recursion.t @ 15910:2b8d5c55ae67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add subrepo recursion tests for add/forget with explicit paths When support for handling add/forget of explicit paths within subrepos was added (9e99d2bbb1b1/95174c381525), nested subrepos weren't handled properly. This change adds test coverage to expose the broken behavior, which will be fixed in later patches.
author David M. Carr <david@carrclan.us>
date Tue, 17 Jan 2012 19:10:54 -0500
parents d6d7b56ec346
children c654eac03452
comparison
equal deleted inserted replaced
15909:8435fa20dff9 15910:2b8d5c55ae67
185 185
186 $ rm -r dir 186 $ rm -r dir
187 $ hg commit --subrepos -m 2-3-2 187 $ hg commit --subrepos -m 2-3-2
188 committing subrepository foo 188 committing subrepository foo
189 committing subrepository foo/bar (glob) 189 committing subrepository foo/bar (glob)
190
191 Test explicit path commands within subrepos: add/forget
192 $ echo z1 > foo/bar/z2.txt
193 $ hg status -S
194 ? foo/bar/z2.txt
195 $ hg add foo/bar/z2.txt
196 This is expected to add the file, but is currently broken
197 $ hg status -S
198 ? foo/bar/z2.txt
199 When fixed, remove the next two commands
200 $ hg add -R foo/bar foo/bar/z2.txt
201 $ hg status -S
202 A foo/bar/z2.txt
203 This is expected to forget the file, but is currently broken
204 $ hg forget foo/bar/z2.txt
205 not removing foo/bar/z2.txt: file is already untracked
206 [1]
207 $ hg status -S
208 A foo/bar/z2.txt
209 When fixed, remove the next two commands
210 $ hg forget -R foo/bar foo/bar/z2.txt
211 $ hg status -S
212 ? foo/bar/z2.txt
213 $ rm foo/bar/z2.txt
190 214
191 Log with the relationships between repo and its subrepo: 215 Log with the relationships between repo and its subrepo:
192 216
193 $ hg log --template '{rev}:{node|short} {desc}\n' 217 $ hg log --template '{rev}:{node|short} {desc}\n'
194 2:1326fa26d0c0 2-3-2 218 2:1326fa26d0c0 2-3-2