equal
deleted
inserted
replaced
60 warning: subrepo spec file '.hgsub' not found |
60 warning: subrepo spec file '.hgsub' not found |
61 warning: subrepo spec file '.hgsub' not found |
61 warning: subrepo spec file '.hgsub' not found |
62 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
62 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
63 $ rm .hgsubstate |
63 $ rm .hgsubstate |
64 $ hg up 0 |
64 $ hg up 0 |
65 remote [destination] changed .hgsubstate which local [working copy] deleted |
65 other [destination] changed .hgsubstate which local [working copy] deleted |
66 use (c)hanged version or leave (d)eleted? c |
66 use (c)hanged version or leave (d)eleted? c |
67 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
67 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
68 $ hg st |
68 $ hg st |
69 $ ls subrepo |
69 $ ls subrepo |
70 a |
70 a |