equal
deleted
inserted
replaced
142 $ hg remove b |
142 $ hg remove b |
143 $ hg commit -d '5 0' -m 'prepare for subsequent backout' |
143 $ hg commit -d '5 0' -m 'prepare for subsequent backout' |
144 $ touch -t 200001010000 c |
144 $ touch -t 200001010000 c |
145 $ hg status -A |
145 $ hg status -A |
146 C c |
146 C c |
147 $ hg debugstate --nodates |
147 $ hg debugstate --no-dates |
148 n 644 12 set c |
148 n 644 12 set c |
149 $ hg backout -d '6 0' -m 'to be rollback-ed soon' -r . |
149 $ hg backout -d '6 0' -m 'to be rollback-ed soon' -r . |
150 removing c |
150 removing c |
151 adding b |
151 adding b |
152 changeset 6:4bfec048029d backs out changeset 5:fac0b729a654 |
152 changeset 6:4bfec048029d backs out changeset 5:fac0b729a654 |
153 $ hg rollback -q |
153 $ hg rollback -q |
154 $ hg status -A |
154 $ hg status -A |
155 A b |
155 A b |
156 R c |
156 R c |
157 $ hg debugstate --nodates |
157 $ hg debugstate --no-dates |
158 a 0 -1 unset b |
158 a 0 -1 unset b |
159 r 0 0 set c |
159 r 0 0 set c |
160 |
160 |
161 across branch |
161 across branch |
162 |
162 |