tests/test-graft.t
changeset 38237 66fc2ef8dbff
parent 38155 5736570718fe
child 38238 2b8c8b8d1a06
equal deleted inserted replaced
38236:a6347ae6168d 38237:66fc2ef8dbff
  1534   |  parent:      0:f7ad41964313
  1534   |  parent:      0:f7ad41964313
  1535   ~  user:        test
  1535   ~  user:        test
  1536      date:        Thu Jan 01 00:00:00 1970 +0000
  1536      date:        Thu Jan 01 00:00:00 1970 +0000
  1537      summary:     bar to b
  1537      summary:     bar to b
  1538   
  1538   
       
  1539 Test that --log is preserved and reused in `hg graft --continue`
       
  1540 
       
  1541   $ hg up '.^^'
       
  1542   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
       
  1543   $ hg graft -r 1 -r 2 --log
       
  1544   grafting 1:80e6d2c47cfe "added b"
       
  1545   merging b
       
  1546   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
       
  1547   abort: unresolved conflicts, can't continue
       
  1548   (use 'hg resolve' and 'hg graft --continue --log')
       
  1549   [255]
       
  1550 
       
  1551   $ echo foobar > b
       
  1552   $ hg resolve -m
       
  1553   (no more unresolved files)
       
  1554   continue: hg graft --continue
       
  1555 
       
  1556   $ hg graft --continue
       
  1557   grafting 1:80e6d2c47cfe "added b"
       
  1558   grafting 2:8be98ac1a569 "added c"
       
  1559 
       
  1560   $ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.'
       
  1561   @  11:7ee8d3496b19 added c
       
  1562   |
       
  1563   o  10:802f1eae3af3 added b
       
  1564   |
       
  1565   o  3:9e887f7a939c bar to b
       
  1566   |
       
  1567   ~