Mercurial > hg
comparison tests/test-rebase-conflicts.t @ 29757:976cd337cac9
changegroup: move branch cache debug message to proper location
Before, we logged about performing a branch cache update when we
weren't actually doing it. Fix that.
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 08 Aug 2016 22:06:07 -0700 |
| parents | a2a380e2750f |
| children | 3e7ded768556 |
comparison
equal
deleted
inserted
replaced
| 29756:46d9a5bb2fb0 | 29757:976cd337cac9 |
|---|---|
| 302 bundle2-input-part: total payload size 1713 | 302 bundle2-input-part: total payload size 1713 |
| 303 bundle2-input-bundle: 0 parts total | 303 bundle2-input-bundle: 0 parts total |
| 304 invalid branchheads cache (served): tip differs | 304 invalid branchheads cache (served): tip differs |
| 305 history modification detected - truncating revision branch cache to revision 9 | 305 history modification detected - truncating revision branch cache to revision 9 |
| 306 rebase completed | 306 rebase completed |
| 307 updating the branch cache | |
| 308 truncating cache/rbc-revs-v1 to 72 | 307 truncating cache/rbc-revs-v1 to 72 |
| 309 | 308 |
| 310 Test minimization of merge conflicts | 309 Test minimization of merge conflicts |
| 311 $ hg up -q null | 310 $ hg up -q null |
| 312 $ echo a > a | 311 $ echo a > a |