Show More
@@ -268,7 +268,7 b' try converting when we have an svn subre' | |||||
268 | $ cd withmerge |
|
268 | $ cd withmerge | |
269 | $ echo "subrepo = [svn]$SVNREPOURL" >.hgsub |
|
269 | $ echo "subrepo = [svn]$SVNREPOURL" >.hgsub | |
270 | $ hg add .hgsub |
|
270 | $ hg add .hgsub | |
271 | $ svn checkout "$SVNREPOURL" subrepo |
|
271 | $ svn checkout "$SVNREPOURL" subrepo | sort | |
272 | A subrepo/proj B |
|
272 | A subrepo/proj B | |
273 | A subrepo/proj B/mytrunk |
|
273 | A subrepo/proj B/mytrunk | |
274 | A subrepo/proj B/mytrunk/letter .txt |
|
274 | A subrepo/proj B/mytrunk/letter .txt | |
@@ -305,7 +305,8 b' try converting when we have an svn subre' | |||||
305 | 1 Adding file2 |
|
305 | 1 Adding file2 | |
306 | 0 merged |
|
306 | 0 merged | |
307 | $ cd withmerge-converted |
|
307 | $ cd withmerge-converted | |
308 | $ hg up |
|
308 | $ hg up | sort | |
|
309 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
309 | A subrepo/proj B |
|
310 | A subrepo/proj B | |
310 | A subrepo/proj B/mytrunk |
|
311 | A subrepo/proj B/mytrunk | |
311 | A subrepo/proj B/mytrunk/letter .txt |
|
312 | A subrepo/proj B/mytrunk/letter .txt | |
@@ -317,7 +318,6 b' try converting when we have an svn subre' | |||||
317 | A subrepo/proj B/tags/v0.2/letter .txt |
|
318 | A subrepo/proj B/tags/v0.2/letter .txt | |
318 | A subrepo/proj B/tags/v0.2/letter2.txt |
|
319 | A subrepo/proj B/tags/v0.2/letter2.txt | |
319 | Checked out revision 9. |
|
320 | Checked out revision 9. | |
320 | 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
321 | $ ls |
|
321 | $ ls | |
322 | file1.txt |
|
322 | file1.txt | |
323 | file2.txt |
|
323 | file2.txt |
General Comments 0
You need to be logged in to leave comments.
Login now