missed commit never get pushed between branches and trunk
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
Initialising Subversion metadata cache in D:/Users/
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/
added README
Committed revision 2.
11. bzr missing svn://localhost
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/
14. echo Text from feature-1 >> README
15. bzr commit -m "Added Feature 1 text"
Committing to: D:/Users/
modified README
Committed revision 3.
16. bzr svn-push svn://localhost
17. bzr missing
Using last location: D:/Users/
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/
19. bzr missing svn://localhost
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
No new revisions to push.
====
svn log svn://localhost
-------
r1 | luislavena | 2008-03-28 20:33:43 -0300 (Fri, 28 Mar 2008) | 3 lines
Skeleton Import
====
svn log svn://localhost
-------
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 standard library: C:\Python25\lib
bzrlib: C:\Python25\
Bazaar configuration: D:\Users\
Bazaar log file: D:\Temp\.bzr.log
====
bzrtools 1.3.0
gtk 0.93.0
launchpad
signing
svn 0.4.9
Changed in bzr-svn: | |
milestone: | none → 0.4.11 |
status: | Triaged → Fix Committed |
Changed in bzr-svn: | |
status: | Fix Committed → Fix Released |
Just reproduced this here.