tests/test-merge-subrepos.t
changeset 45840 527ce85c2e60
parent 42565 4764e8436b2a
child 46738 b4ad45f2f648
equal deleted inserted replaced
45839:ebee234d952a 45840:527ce85c2e60
    44   update: 1 new changesets, 2 branch heads (merge)
    44   update: 1 new changesets, 2 branch heads (merge)
    45   phases: 5 draft
    45   phases: 5 draft
    46 
    46 
    47   $ hg up --check -r '.^'
    47   $ hg up --check -r '.^'
    48   abort: uncommitted changes
    48   abort: uncommitted changes
    49   [255]
    49   [20]
    50   $ hg st -S
    50   $ hg st -S
    51   ! a
    51   ! a
    52   $ hg up -Cq .
    52   $ hg up -Cq .
    53 
    53 
    54 Test that dirty is consistent through subrepos
    54 Test that dirty is consistent through subrepos