missed commit never get pushed between branches and trunk

Bug #208566 reported by Luis Lavena
2
Affects Status Importance Assigned to Milestone
Bazaar Subversion Plugin
Fix Released
Medium
Jelmer Vernooij

Bug Description

This could be similar to Bug #145165 (bzr missing reports extra revs, yet push says nothing to do) which was marked as invalid, but similar behavior still happens:

1. Take a empty repository with only branches, tags and trunk
2. bzr init-repo branch_test.bzr --rich-root-pack --no-trees
3. cd branch_test.bzr
4. bzr init trunk && cd trunk

5. bzr pull svn://localhost/branch_test/trunk

Initialising Subversion metadata cache in D:/Users/Luis/.config/bazaar/2.0\svn-cache\eca57c04-8873-3b47-907b-db62cd455b18
Now on revision 1.

6. cd ..
7. bzr checkout --lightweight trunk work-copy
8. cd work-copy
9. echo Simple Text > README
10. bzr add README && bzr commit -m "Added README"

added README
Committing to: D:/Users/Luis/projects/branch_test.bzr/trunk/
added README
Committed revision 2.

11. bzr missing svn://localhost/branch_test/trunk

You have 1 extra revision(s):
------------------------------------------------------------
revno: 2
committer: Luis Lavena <email address hidden>
branch nick: trunk
timestamp: Fri 2008-03-28 20:35:45 -0300
message:
  Added README

12. bzr branch ..\trunk ..\feature-1

Branched 2 revision(s).

13. bzr switch ..\feature-1

Tree is up to date at revision 2.
Switched to branch: D:/Users/Luis/projects/branch_test.bzr/feature-1/

14. echo Text from feature-1 >> README
15. bzr commit -m "Added Feature 1 text"

Committing to: D:/Users/Luis/projects/branch_test.bzr/feature-1/
modified README
Committed revision 3.

16. bzr svn-push svn://localhost/branch_test/branches/feature-1
17. bzr missing

Using last location: D:/Users/Luis/projects/branch_test.bzr/trunk/
You have 1 extra revision(s):
------------------------------------------------------------
revno: 3
committer: Luis Lavena <email address hidden>
branch nick: feature-1
timestamp: Fri 2008-03-28 20:37:15 -0300
message:
  Added Feature 1 text

18. bzr switch ..\trunk

Updated to revision 2.
Switched to branch: D:/Users/Luis/projects/branch_test.bzr/trunk/

19. bzr missing svn://localhost/branch_test/trunk

You have 1 extra revision(s):
------------------------------------------------------------
revno: 2
committer: Luis Lavena <email address hidden>
branch nick: trunk
timestamp: Fri 2008-03-28 20:35:45 -0300
message:
  Added README

20. bzr push svn://localhost/branch_test/trunk

No new revisions to push.

====

svn log svn://localhost/branch_test/trunk
------------------------------------------------------------------------
r1 | luislavena | 2008-03-28 20:33:43 -0300 (Fri, 28 Mar 2008) | 3 lines

Skeleton Import

====

svn log svn://localhost/branch_test/branches/feature-1

------------------------------------------------------------------------
r3 | luislavena | 2008-03-28 20:38:09 -0300 (Fri, 28 Mar 2008) | 1 line

Added Feature 1 text
------------------------------------------------------------------------
r2 | luislavena | 2008-03-28 20:38:09 -0300 (Fri, 28 Mar 2008) | 1 line

Added README
------------------------------------------------------------------------
r1 | luislavena | 2008-03-28 20:33:43 -0300 (Fri, 28 Mar 2008) | 3 lines

Skeleton Import

====

Bazaar (bzr) 1.3
  Python interpreter: C:\Python25\python.exe 2.5.1.final.0
  Python standard library: C:\Python25\lib
  bzrlib: C:\Python25\lib\site-packages\bzrlib
  Bazaar configuration: D:\Users\Luis\.config\bazaar\2.0
  Bazaar log file: D:\Temp\.bzr.log

====

bzrtools 1.3.0
gtk 0.93.0
launchpad
signing
svn 0.4.9

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

Just reproduced this here.

Changed in bzr-svn:
assignee: nobody → jelmer
importance: Undecided → Medium
status: New → Triaged
Jelmer Vernooij (jelmer)
Changed in bzr-svn:
milestone: none → 0.4.11
status: Triaged → Fix Committed
Jelmer Vernooij (jelmer)
Changed in bzr-svn:
status: Fix Committed → Fix Released
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.