dpush of multiple revisions doesn't handle added files well

Bug #300979 reported by Lukáš Lalinský
4
Affects Status Importance Assigned to Milestone
Bazaar Subversion Plugin
Fix Released
Medium
Jelmer Vernooij

Bug Description

If you dpush multiple revisions, it will not rebase after each revision and will remove/readd new files in each revision:

lukas@nemo:~$ svnadmin create /tmp/bzr-svn-test
lukas@nemo:~$ bzr branch file:///tmp/bzr-svn-test
Initialising Subversion metadata cache in /home/lukas/.bazaar/svn-cache/3e5484a3-472d-468e-b5ea-566deb9b48f0
Branched 1 revision(s).
lukas@nemo:~$ cd bzr-svn-test/
lukas@nemo:~/bzr-svn-test$ touch a
lukas@nemo:~/bzr-svn-test$ bzr add a
added a
lukas@nemo:~/bzr-svn-test$ bzr ci -m 'adding a'
Committing to: /home/lukas/bzr-svn-test/
added a
Committed revision 2.
lukas@nemo:~/bzr-svn-test$ touch b
lukas@nemo:~/bzr-svn-test$ bzr add b
added b
lukas@nemo:~/bzr-svn-test$ bzr ci -m 'adding b'
Committing to: /home/lukas/bzr-svn-test/
added b
Committed revision 3.
lukas@nemo:~/bzr-svn-test$ bzr dpush file:///tmp/bzr-svn-test
All changes applied successfully.
lukas@nemo:~/bzr-svn-test$ bzr log -v --long
------------------------------------------------------------
revno: 3
svn revno: 2 (on /)
committer: lukas
timestamp: Sat 2008-11-22 11:51:50 +0000
message:
  adding b
removed:
  a
added:
  a
  b
------------------------------------------------------------
revno: 2
svn revno: 1 (on /)
committer: lukas
timestamp: Sat 2008-11-22 11:51:50 +0000
message:
  adding a
added:
  a
------------------------------------------------------------
revno: 1
svn revno: 0 (on /)
committer:
timestamp: Sat 2008-11-22 11:50:23 +0000
message:
  (no message)

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

0.5 now has a test that demonstrates this bug.

Changed in bzr-svn:
assignee: nobody → jelmer
status: Triaged → In Progress
Jelmer Vernooij (jelmer)
Changed in bzr-svn:
status: In Progress → Fix Released
milestone: none → 0.5.0
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.