tests/test-evolve-issue5832.t
branchmercurial-4.4
changeset 4076 f9a850018daa
parent 3930 d00f0c369bc7
parent 4053 ecbf61d90807
child 4077 9c025ec4af88
child 4081 20dcc92c285f
equal deleted inserted replaced
4032:fc065ec30351 4076:f9a850018daa
   189   
   189   
   190   $ hg up bde1d2b6b5e5
   190   $ hg up bde1d2b6b5e5
   191   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   191   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   192   $ echo l > l
   192   $ echo l > l
   193   $ hg ci -Aqm "added l"
   193   $ hg ci -Aqm "added l"
   194   $ hg grab -r 1b24879c5c3c
   194   $ hg pick -r 1b24879c5c3c
   195   grabbing 1:1b24879c5c3c "added a"
   195   grabbing 1:1b24879c5c3c "added a"
   196 
   196 
   197   $ hg up bde1d2b6b5e5
   197   $ hg up bde1d2b6b5e5
   198   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   198   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   199   $ echo c > c
   199   $ echo c > c
   334   
   334   
   335   $ hg up bde1d2b6b5e5
   335   $ hg up bde1d2b6b5e5
   336   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   336   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   337   $ echo l > l
   337   $ echo l > l
   338   $ hg ci -Aqm "added l"
   338   $ hg ci -Aqm "added l"
   339   $ hg grab -r 1b24879c5c3c
   339   $ hg pick -r 1b24879c5c3c
   340   grabbing 1:1b24879c5c3c "added a"
   340   grabbing 1:1b24879c5c3c "added a"
   341 
   341 
   342   $ hg up bde1d2b6b5e5
   342   $ hg up bde1d2b6b5e5
   343   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   343   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
   344   $ echo c > c
   344   $ echo c > c