On Sat, 11 May 2013 23:34:17 -0700
Matt Wilkie <[email protected]> wrote:
> bzr: ERROR: Server sent an unexpected error: ('error',
> 'AppendRevisionsOnlyViolation', 'Operation denied because it would change
> the main history, which is not permitted by the append_revisions_only
> setting on branch
> "chroot-84479760:///~leo-editor-team/leo-editor/trunk3/".')
Whatever you tried would have changed the trunk from this
1234 Did something - Edward
1233 Did something - Edward
1232 Did something - Edward
1231 Did something - Edward
1230 Did something - Edward
1229 Did something - Edward
1228 Did something - Edward
to
1230 What Matt did - Matt
1230.5 Did something - Edward
1230.4 Did something - Edward
1230.3 Did something - Edward
1230.2 Did something - Edward
1230.1 Did something - Edward
1229 Did something - Edward
1228 Did something - Edward
which loses nothing, but makes the timeline of the trunk harder to
follow, so there's a flag set on the repo. to prevent that.
so you just need to branch a fresh copy of the trunk in a separate
folder from where you did your work(*), and them merge from your branch
into the fresh trunk, and push that, resulting in the trunk becoming
1235 .leo association stuff - Matt
1235.2 more work on association - Matt
1235.1 first attempt at association - Matt
1234 Did something - Edward
1233 Did something - Edward
1232 Did something - Edward
...
(*) pulling a fresh copy of the trunk is very quick *if* you have your
branches in a common shared repository folder, it may be quite slow
otherwise.
Cheers -Terry
--
You received this message because you are subscribed to the Google Groups
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/leo-editor?hl=en-US.
For more options, visit https://groups.google.com/groups/opt_out.
