Comment 16 for bug 597891

Revision history for this message
John Szakmeister (jszakmeister) wrote : Re: [Bug 597891] Re: 'bzr reconcile' doesn't reconcile the branch

On Fri, Oct 15, 2010 at 5:56 AM, Martin Pool <email address hidden> wrote:
> 2.2 tip also succeeds for me like this:
>
> Am I doing something wrong?  All I did was untar this and run this
> command:
>
> mbp@grace% ~/bzr/bzr.2.2/bzr reconcile .
> Reconciling branch file:///home/mbp/testdata/597891/unreconcilable/
> revision_history ok.
> Reconciling repository file:///home/mbp/testdata/597891/unreconcilable/
> Reconciliation complete.
> bzr: warning: some compiled extensions could not be loaded; see
> <https://answers.launchpad.net/bzr/+faq/703>

Did you run 'bzr check' afterwards? For me, it still shows an
inconsistent parent, which was fixed in the past:

<email address hidden>:/Users/jszakmeister/tmp/unrec
:: bzr --version
Bazaar (bzr) 2.2.1
  Python interpreter:
/System/Library/Frameworks/Python.framework/Versions/Current/bin/python
2.6.1
  Python standard library:
/System/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6
  Platform: Darwin-10.4.0-i386-64bit
  bzrlib: /Users/jszakmeister/Library/Python/2.6/site-packages/bzrlib
  Bazaar configuration: /Users/jszakmeister/.bazaar
  Bazaar log file: /Users/jszakmeister/.bzr.log

Copyright 2005-2010 Canonical Ltd.
http://bazaar.canonical.com/

bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.

Bazaar is part of the GNU Project to produce a free operating system.

<email address hidden>:/Users/jszakmeister/tmp/unrec
:: bzr check unreconcilable/
Checking working tree at '/Users/jszakmeister/tmp/unrec/unreconcilable'.
Checking branch at 'file:///Users/jszakmeister/tmp/unrec/unreconcilable/'.
Checking repository at 'file:///Users/jszakmeister/tmp/unrec/unreconcilable/'.
checked repository
file:///Users/jszakmeister/tmp/unrec/unreconcilable/ format
RepositoryFormat2a()
     3 revisions
     3 file-ids
     1 ghost revisions
     1 inconsistent parents
checked branch file:///Users/jszakmeister/tmp/unrec/unreconcilable/
format Branch format 7

<email address hidden>:/Users/jszakmeister/tmp/unrec
:: bzr reconcile unreconcilable/
Reconciling branch file:///Users/jszakmeister/tmp/unrec/unreconcilable/
revision_history ok.
Reconciling repository file:///Users/jszakmeister/tmp/unrec/unreconcilable/
Reconciliation complete.

<email address hidden>:/Users/jszakmeister/tmp/unrec
:: bzr check unreconcilable/
Checking working tree at '/Users/jszakmeister/tmp/unrec/unreconcilable'.
Checking branch at 'file:///Users/jszakmeister/tmp/unrec/unreconcilable/'.
Checking repository at 'file:///Users/jszakmeister/tmp/unrec/unreconcilable/'.
checked repository
file:///Users/jszakmeister/tmp/unrec/unreconcilable/ format
RepositoryFormat2a()
     3 revisions
     3 file-ids
     1 ghost revisions
     1 inconsistent parents
checked branch file:///Users/jszakmeister/tmp/unrec/unreconcilable/
format Branch format 7

-John