tests/test-graft-interrupted.t
changeset 44345 14d0e89520a2
parent 44040 58db8f63f4e2
child 44725 16c361152133
equal deleted inserted replaced
44344:ab632e27f296 44345:14d0e89520a2
   429   [255]
   429   [255]
   430 
   430 
   431   $ hg log -GT "{rev}:{node|short} {desc}"
   431   $ hg log -GT "{rev}:{node|short} {desc}"
   432   @  6:6ec71c037d94 added x
   432   @  6:6ec71c037d94 added x
   433   |
   433   |
   434   | o  5:36b793615f78 added foo to c
   434   | %  5:36b793615f78 added foo to c
   435   | |
   435   | |
   436   | | o  4:863a25e1a9ea added x
   436   | | o  4:863a25e1a9ea added x
   437   | |/
   437   | |/
   438   o |  3:9150fe93bec6 added d
   438   o |  3:9150fe93bec6 added d
   439   | |
   439   | |
   620   $ hg graft --continue
   620   $ hg graft --continue
   621   grafting 3:09e253b87e17 "A in file a"
   621   grafting 3:09e253b87e17 "A in file a"
   622   $ hg log -GT "{rev}:{node|short} {desc}\n"
   622   $ hg log -GT "{rev}:{node|short} {desc}\n"
   623   @  4:2aa9ad1006ff B in file a
   623   @  4:2aa9ad1006ff B in file a
   624   |
   624   |
   625   | o  3:09e253b87e17 A in file a
   625   | %  3:09e253b87e17 A in file a
   626   | |
   626   | |
   627   | o  2:d36c0562f908 c
   627   | o  2:d36c0562f908 c
   628   | |
   628   | |
   629   o |  1:d2ae7f538514 b
   629   o |  1:d2ae7f538514 b
   630   |/
   630   |/
   667   +A
   667   +A
   668 
   668 
   669   $ hg log -GT "{rev}:{node|short} {desc}\n"
   669   $ hg log -GT "{rev}:{node|short} {desc}\n"
   670   @  4:2aa9ad1006ff B in file a
   670   @  4:2aa9ad1006ff B in file a
   671   |
   671   |
   672   | o  3:09e253b87e17 A in file a
   672   | %  3:09e253b87e17 A in file a
   673   | |
   673   | |
   674   | o  2:d36c0562f908 c
   674   | o  2:d36c0562f908 c
   675   | |
   675   | |
   676   o |  1:d2ae7f538514 b
   676   o |  1:d2ae7f538514 b
   677   |/
   677   |/
   710   +c
   710   +c
   711 
   711 
   712   $ hg log -GT "{rev}:{node|short} {desc}\n"
   712   $ hg log -GT "{rev}:{node|short} {desc}\n"
   713   @  4:2aa9ad1006ff B in file a
   713   @  4:2aa9ad1006ff B in file a
   714   |
   714   |
   715   | o  3:09e253b87e17 A in file a
   715   | %  3:09e253b87e17 A in file a
   716   | |
   716   | |
   717   | o  2:d36c0562f908 c
   717   | o  2:d36c0562f908 c
   718   | |
   718   | |
   719   o |  1:d2ae7f538514 b
   719   o |  1:d2ae7f538514 b
   720   |/
   720   |/