git: dpush doesn't check for diverged branches

Bug #1042102 reported by ChriS
16
This bug affects 3 people
Affects Status Importance Assigned to Milestone
Bazaar Git Plugin
Triaged
Medium
Unassigned
Breezy
Fix Released
Medium
Jelmer Vernooij

Bug Description

"bzr dpush" to remote repositories doesn't check whether the ancestries have diverged. It should, consistent with "bzr push".

Related branches

Revision history for this message
ChriS (christophe-troestler) wrote :

I have checked that the same thing happens with gitourious.

tags: removed: github
Jelmer Vernooij (jelmer)
summary: - dpush "overrides" commits
+ dpush doesn't check for diverged branches
Changed in bzr-git:
status: New → Triaged
importance: Undecided → Medium
description: updated
Revision history for this message
Jan Kroeze (thejcwk) wrote : Re: dpush doesn't check for diverged branches

I can confirm, dpush stomps commits.

Revision history for this message
Ted (tedks) wrote :

Is this a bug in bzr, or in bzr-git?

What's the status on this? I still see this behavior with the latest lp:bzr-git, and it makes using bzr-git untenable for collaborative projects.

Jelmer Vernooij (jelmer)
Changed in brz-git:
status: New → Triaged
importance: Undecided → Medium
Jelmer Vernooij (jelmer)
Changed in brz-git:
assignee: nobody → Jelmer Vernooij (jelmer)
milestone: none → integration
Jelmer Vernooij (jelmer)
Changed in brz-git:
status: Triaged → Fix Released
Jelmer Vernooij (jelmer)
affects: brz-git → brz
Changed in brz:
milestone: integration → none
Jelmer Vernooij (jelmer)
Changed in brz:
milestone: none → 3.0.0
summary: - dpush doesn't check for diverged branches
+ git: dpush doesn't check for diverged branches
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers