Pushing several local commits to a remote branch
John Arbash Meinel
john at arbash-meinel.com
Sat Jun 26 22:47:57 BST 2010
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Eli Zaretskii wrote:
> The Emacs repository still uses sftp, which is slow. So much so that
> one of the most active contributors to Emacs says he thinks twice
> before trying to do any development work, see
> http://lists.gnu.org/archive/html/emacs-devel/2010-06/msg00989.html.
>
> Given this sad state of affairs, I thought that perhaps using
> "bzr ci --local" for several changes followed by a single push
> could make the life of a contributor easier, as the overhead of
> the sftp protocol would be sustained only once.
>
> The question is, since the master repository is on Savannah, is
> there any possibility to screw up history either on the master
> branch or in the local branch bound to it?
>
> Any advice will be appreciated.
>
> TIA
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.
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.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAkwmdY0ACgkQJdeBCYSNAAOgrACdH4XvNuns2gZtJxWabU0qxVIU
OTkAniHwPU4kM/arMXZKpXcHb+aYb5S6
=nNjc
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list