git: dpush doesn't check for diverged branches
Bug #1042102 reported by
ChriS
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
lp://staging/~jelmer/brz-git/diverged-branches
- Jelmer Vernooij: Approve
-
Diff: 358 lines (+118/-26)8 files modifiedbranch.py (+14/-6)
fetch.py (+1/-1)
interrepo.py (+11/-7)
push.py (+31/-0)
refs.py (+15/-10)
remote.py (+12/-2)
tests/test_remote.py (+31/-0)
transportgit.py (+3/-0)
Revision history for this message
| ChriS (christophe-troestler) wrote | #1 |
| tags: | removed: github |
| 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 | #2 |
Revision history for this message
| Ted (tedks) wrote | #3 |
| Changed in brz-git: | |
| status: | New → Triaged |
| importance: | Undecided → Medium |
| Changed in brz-git: | |
| assignee: | nobody → Jelmer Vernooij (jelmer) |
| milestone: | none → integration |
| Changed in brz-git: | |
| status: | Triaged → Fix Released |
| affects: | brz-git → brz |
| Changed in brz: | |
| milestone: | integration → none |
| 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.
I have checked that the same thing happens with gitourious.