Comment 2 for bug 605067

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Loïc Minier wrote:
> Public bug reported:
>
> Binary package hint: bzr
>
> Hey
>
> I think we need a way to prevent bzr push from replacing the history
> when it think it can do so; this might not be the right thing to do for
> local branches, but it's certainly the default behavior we want in
> Launchpad.
>
> Here's the story
>
> 16:43 < lool> poolie: So basically someone had a bzr branch of our trunk, did a
> local commit, pushed to a topic branch in launchpad, asked for a
> merge
> 16:43 < lool> I merged it, pushed to the trunk branch
> 16:44 < lool> this guy then did another merge, forgetting that he abused his
> local trunk branch as a topic branch
> 16:44 < lool> he pushed
> 16:44 < lool> Launchpad accepted that silently
> 16:44 < lool> but sent out an email that one revision had been removed
> 16:44 < lool> I was told this bzr behavior makes sense when working locally
> 16:44 < lool> If you look at the history now though, it misses my merge
> completely

Isn't the original fix for this setting "append_revisions_only" on the
trunk? (Preventing this sort of behavior).

In the short term, doing:

 bzr branch lp:.../trunk -r -2
 bzr merge XXX
 bzr commit -m "Merging X correctly"
 bzr push --overwrite lp:.../trunk

There are other ways, but it seems reasonable.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkw9fAQACgkQJdeBCYSNAAMiawCfcbsuF0YbEFWDgA7wgtgh7SR4
gaMAnRcNnGpm3HjuXCZcWv0cCtJuYWcT
=rzkq
-----END PGP SIGNATURE-----