[PATCH] push to diverged branch
aaron.bentley at utoronto.ca
Mon Oct 9 21:48:10 BST 2006
-----BEGIN PGP SIGNED MESSAGE-----
Matthieu Moy wrote:
> John Arbash Meinel <john at arbash-meinel.com> writes:
>>> (BTW, is "push --overwrite" really useful?)
>> As mentioned it used to be necessary. And at this point, it is still
>> useful to overwrite diverged branches with an explicit *this is what I
>> want*. Sort of a 'I know what I'm doing, let me do it' flag. While you
>> may lose some revisions in a history, you won't lose any data from the
>> repository, so it isn't really lossy (but not entirely lossless either).
> For this kind of cases, I'd rather let the user log into the server
> and delete his branch manually. I don't find it terribly useful, and
> potentially dangerous, so ... But that's not a strong opinion.
I've certainly found pull --overwrite to be useful. I never use push.
Deleting the branch from the server (which may not be possible-- e.g.
launchpad branches) and then pushing from scratch is much, much slower
than push --overwrite.
I think the message should describe both options for resolving the
problem of diverged branches, ie:
These branches have diverged. Use "merge", "commit", then "push" to
combine the changes, or use "push--overwrite" to overwrite remote changes.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v18.104.22.168 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar