lost commits in our repo!

[Sebastian Kuzminsky]

Jelmer Vernooij wrote:
> Am Donnerstag, den 25.09.2008, 14:10 -0600 schrieb Sebastian Kuzminsky:
>> Then I went up to the first thread above the bottom, and all the other 
>> people's changes showed up as "M" changed files (there were no conflicts 
>> with my commited changes on that thread).  I committed the merge and ran 
>> "bzr push" to the svn repo.
>>
>> This is where the troubles showed up...
>>
> Yes, this is intentional. From the bzr-svn FAQ:
> 
> bzr-svn did a replace operation on the branch I pushed to when I tried
> to push a merge commit to Subversion
> -----------------------------------------------------------------------------------------------------------
> Yes, this is because bzr-svn has to preserve the mainline history of
> your Bazaar branch in Subversion.
> 
> If you would like to avoid this, use a checkout and merge into that
> ("bzr co") or rebase on trunk rather than merging it.
> 
> For example::
> 
>  $ bzr push ../trunk
>  bzr: ERROR: These branches have diverged.  Try using "merge" and then
> "push".
>  $ bzr rebase ../trunk
>  All changes applied successfully.
>  ...
>  $ bzr push ../trunk
>  All changes applied successfully.
>  Pushed up to revision 1075.
> 
> If you would like to forbid Bazaar from ever doing these replace
> operations, set the ``append_revisions_only`` setting to True for the
> repository you're
> pushing to.

I added "append_revisions_only = True" to this branch's 
.bzr/branch/branch.conf, and now when I try to down-thread to the bottom 
thread I get this error:

0 seb at water>  bzr show-loom
=>bdm-client-cli
   cleanups
   trunk
0 seb at water>  bzr down-thread
All changes applied successfully.
bzr: ERROR: Operation denied because it would change the main history, 
which is not permitted by the append_revisions_only setting on branch 
"/home/seb/work/bioserve/bzr/dev/".


-- 
Sebastian Kuzminsky
romano hip hop - romano hip hop in the house
<http://www.youtube.com/watch?v=D-azvIwldYg>