bzr missing reports extra revs, yet push says nothing to do

Bug #145165 reported by Maciej Katafiasz
2
Affects Status Importance Assigned to Milestone
Bazaar Subversion Plugin
Invalid
Medium
Jelmer Vernooij

Bug Description

bzr missing will report extra local revisions compared to the upstream SVN branch, yet bzr push will say there's nothing to push. Tested with 0.4 r719.

The following command log reproduces it:

mkdir -p /tmp/bzr-nopush
cd /tmp/bzr-nopush

svnadmin create test
svn co file://$PWD/test/ testco
cd testco/
mkdir tags branches trunk
svn add *
svn commit -m "a commit"

cd trunk/
echo foo > foo.txt
svn add foo.txt
svn commit -m "a commit"

cd ../../
bzr get file://$PWD/test/trunk bzrco
cd bzrco/
echo bar > bar.txt
bzr add bar.txt
bzr commit -m "a commit"
bzr svn-push file://$PWD/../test/branches/abranch

cd ../testco/
svn up
cd /tmp/bzr-nopush/bzrco/
bzr missing # Says "extra local revisions"
bzr push /tmp/bzr-nopush/test/trunk # Claims there's nothing to do

Revision history for this message
Jelmer Vernooij (jelmer) wrote : Re: [Bug 145165] bzr missing reports extra revs, yet push says nothing to do

Thanks for the bugreport.

  status triaged
  importance medium
--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

Jelmer Vernooij (jelmer)
Changed in bzr-svn:
importance: Undecided → Medium
status: New → Triaged
Jelmer Vernooij (jelmer)
Changed in bzr-svn:
assignee: nobody → jelmer
milestone: none → 0.4.4
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

The two are using different locations - missing uses the parent location, push uses the push location. This is somewhat confusing, but that's an upstream issue (see .bzr/branch/branch.conf)

Changed in bzr-svn:
status: Triaged → Invalid
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.