Bazaar

  1. Bug #338516
  2. Comment #2

Comment 2 for bug 338516

Revision history for this message
Ken Arnold (kenneth-arnold) wrote : Re: error merging after reverting unversioned parent conflict

Follow-ups: bzr check runs clean on the repository:
Checking working tree at 'file:///home/kcarnold/csc/divisi/'.
Checking repository at 'file:///home/kcarnold/csc/divisi/'.
checked repository <bzrlib.transport.local.LocalTransport url=file:///home/kcarnold/csc/divisi/> format <RepositoryFormatKnitPack4>
   240 revisions
   676 file-ids
  1208 unique file texts
 36795 repeated file texts
     0 unreferenced text versions
Checking branch at 'file:///home/kcarnold/csc/divisi/'.
checked branch file:///home/kcarnold/csc/divisi/ format Bazaar Branch Format 6 (bzr 0.15)

I'm attaching what should be the full sequence of commands I ran on the repo (from my bash history).