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
16:45 < poolie> it's not on the mainline or it's not there at all?
16:45 < lool> it has the same data in the same timeline in the log, but one
merge commit is missing around the change I merged
16:45 < lool> poolie: My merge was removed from mainline by a mere bzr push
16:45 < lool> the revision got superseded by his local commit
16:46 < poolie> lool, so from what mwh said we might want an option or a
behaviour to allow uncommit but not allow other changes to the
mainline
16:46 <@lool> Yes
16:47 <@lool> poolie: Cause it might be handy to be able to uncommit just after
doing a bad commit, pushing to the wrong place or so
16:47 <@lool> but I dont want to allow silently replacing history
16:52 <@lool> poolie: Are you in agreement? am I expected to file a bug
against bzr now, or will you folks hack and deploy it on the spot
so that I never need to worry about it again? :-)
16:53 < poolie> lool, i do agree this makes sense
16:53 < poolie> i wonder if this should almost be on by default in some cases
Cheers,
ProblemType: Bug
DistroRelease: Ubuntu 10.10
Package: bzr 2.1.2-1
ProcVersionSignature: Ubuntu 2.6.35-6.9-generic 2.6.35-rc3
Uname: Linux 2.6.35-6-generic x86_64
Architecture: amd64
Date: Tue Jul 13 16:54:06 2010
ProcEnviron:
LANGUAGE=fr_FR:fr:en_GB:en
PATH=(custom, user)
LANG=fr_FR.UTF-8
SHELL=/bin/zsh
SourcePackage: bzr
** Affects: bzr (Ubuntu)
Importance: Undecided
Status: New
** Tags: amd64 apport-bug maverick
--
Allows history rewrites
https://bugs.launchpad.net/bugs/605067
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
