Push is possible

Bug #719238 reported by Pietro Battiston
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar Git Plugin
Fix Released
High
Jelmer Vernooij

Bug Description

pietro@voubian:/tmp$ mkdir pippo
pietro@voubian:/tmp$ cd pippo/
pietro@voubian:/tmp/pippo$ bzr branch lp:gueic
Branched 136 revision(s).
pietro@voubian:/tmp/pippo$ mkdir with_git
pietro@voubian:/tmp/pippo$ cd with_git/
pietro@voubian:/tmp/pippo/with_git$ git init
Initialized empty Git repository in /tmp/pippo/with_git/.git/
pietro@voubian:/tmp/pippo/with_git$ cd ../gueic/
pietro@voubian:/tmp/pippo/gueic$ bzr push ../with_git/
This transport does not update the working tree of: file:///tmp/pippo/with_git/. See 'bzr help working-trees' for more information.
Created new branch.
pietro@voubian:/tmp/pippo/gueic$ bzr pull ../with_git/
bzr: ERROR: These branches have diverged. Use the missing command to see how.
Use the merge command to reconcile them.
pietro@voubian:/tmp/pippo/gueic$ apt-cache policy bzr-git
bzr-git:
  Installato: 0.5.4-1
  Candidato: 0.5.4-1
  Tabella versione:
 *** 0.5.4-1 0
        100 /var/lib/dpkg/status
     0.5.3-1 0
        650 http://ftp.it.debian.org/debian/ wheezy/main amd64 Packages

Now, I do see read at https://launchpad.net/bzr-git that "All operations except for "push" are supported."... but then I assume it's just outdated, since the README and bug #690547 seem to suggest "push" is supported too (and indeed it seems to work).

(I'm using Debian testing with bzr-git package from Debian sid)

Related branches

description: updated
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

push is only supported when experimental mappings are enabled. I need to disable it in all other situations.

Jelmer Vernooij (jelmer)
Changed in bzr-git:
status: New → Triaged
importance: Undecided → High
summary: - "These branches have diverged" - he's lying
+ Push is possible
Jelmer Vernooij (jelmer)
Changed in bzr-git:
assignee: nobody → Jelmer Vernooij (jelmer)
Jelmer Vernooij (jelmer)
Changed in bzr-git:
status: Triaged → Fix Released
Revision history for this message
m1st0 (m1st0) wrote :

The following worked for me directly in Ubuntu 12.10:

  $ mkdir website.git
  $ cd website.git
  $ bzr init --format=git

  $ cd ../bazaar-website/
  $ bzr dpush ../website.git

Using bzr log in the Bazaar repo and git log in the Git repo produced the equivalent output for each DVCS.

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

That doesn't say much. The revision ids and other metadata are not visible in log output.

The point is that if you run "bzr branch website.git bazaar-website-2" that the contents in bazaar-website and bazaar-website-2 have diverged if you originally pushed from bzr to git with dpush.

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.