Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-bundle-r.out @ 5344:cc34be74eeec
Merge with crew-stable.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Sat, 29 Sep 2007 21:10:54 -0700 |
parents | 30d4d8985dd8 |
children |
comparison
equal
deleted
inserted
replaced
5343:26692d08c2f9 | 5344:cc34be74eeec |
---|---|
150 abort: repository default-push not found! | 150 abort: repository default-push not found! |
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
152 % 2 | 152 % 2 |
153 2:d62976ca1e50 | 153 2:d62976ca1e50 |
154 adding changesets | 154 adding changesets |
155 abort: unknown parent ac69c658229d! | |
156 transaction abort! | 155 transaction abort! |
157 rollback completed | 156 rollback completed |
157 abort: unknown parent ac69c658229d! | |
158 % 2 | 158 % 2 |
159 2:d62976ca1e50 | 159 2:d62976ca1e50 |
160 adding changesets | 160 adding changesets |
161 adding manifests | 161 adding manifests |
162 adding file changes | 162 adding file changes |