Pushing several local commits to a remote branch
Eli Zaretskii
eliz at gnu.org
Sun Jun 27 18:06:23 BST 2010
> Date: Sat, 26 Jun 2010 16:47:57 -0500
> From: John Arbash Meinel <john at arbash-meinel.com>
> CC: bazaar at lists.canonical.com
>
> The master repo has 'append_revisions_only = True' which means that he
> won't be able to push a change that isn't a strict superset of the
> existing history.
Thanks, this part is clear: it means that there could be a need to
"bzr up" before committing to the master repository.
> It does mean that if he does commit local a few times and then pushes,
> it is possible for him to get out-of-sync and need to resynchronize.
> 'bzr update && bzr commit' should get him back in sync. It will turn his
> local commits into merged commits, but that's pretty much what you have
> to do with parallel development.
I'm not sure I get the last part, which is actually the point of my
question (sorry if that was unclear). Let's take an example. Suppose
I do the following sequence of commands:
bzr up
hack, hack
bzr ci --local # revno A
hack some more
bzr ci --local # revno B
bzr up
bzr ci
and suppose that someone committed 2 revisions X and Y to the master
repository while I was hacking away, which "bzr up" brought to my
local branch. What will be the history DAG of the master repository
after my last "bzr ci"?
TIA
More information about the bazaar
mailing list