confused about push/pull/merge and append_revisions_only
Chris Hecker
checker at d6.com
Fri Jan 13 21:52:23 UTC 2012
I have a repository I push to from multiple places. I recently set
append_revisions_only on it, because it's the main server repo, and I
was always weirded out by a bzr client's ability to modify the existing
history, which seemed to go against the idea of source code control.
However, I clearly don't understand something, because now I can't push
to the repo.
I did a pull, but my local history had diverged (this was expected,
since I'd done some work locally), so I did a merge from the server and
a local commit. Then I went to push, which was my normal workflow, but
I got this:
Using saved push location: /home/checker/bzr/spyparty/
bzr: ERROR: Operation denied because it would change the main history,
which is not permitted by the append_revisions_only setting on branch
"/home/checker/bzr/spyparty/".
Now I'm not sure what my workflow should be. How do I push changes back
to the server repository? Do I not want append_revisions_only?
Thanks,
Chris
More information about the bazaar
mailing list