Mercurial > hg

comparison tests/test-update-reverse.t @ 18631:e2dc5397bc82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update test output (will be folded into parent)
author Bryan O'Sullivan <bryano@fb.com>
date Sat, 09 Feb 2013 15:22:04 -0800
parents bcf29565d89f
children 4b5d37ca3c11
comparison
equal deleted inserted replaced
18630:9b9e2d9e83a1 18631:e2dc5397bc82
69 branchmerge: False, force: True, partial: False 69 branchmerge: False, force: True, partial: False
70 ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf 70 ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf
71 side1: other deleted -> r 71 side1: other deleted -> r
72 side2: other deleted -> r 72 side2: other deleted -> r
73 main: remote created -> g 73 main: remote created -> g
74 removing side1
74 updating: side1 1/3 files (33.33%) 75 updating: side1 1/3 files (33.33%)
75 removing side1 76 removing side2
76 updating: side2 2/3 files (66.67%) 77 updating: side2 2/3 files (66.67%)
77 removing side2 78 getting main
78 updating: main 3/3 files (100.00%) 79 updating: main 3/3 files (100.00%)
79 getting main
80 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 80 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
81 81
82 $ ls 82 $ ls
83 a 83 a
84 main 84 main