Looking at the directories directly:
http://bazaar.launchpad.net/~ubuntu-on-ec2/ubuntu-on-ec2/live-build/.bzr/repository/packs/
vs
http://bazaar.launchpad.net/~ubuntu-on-ec2/live-build/cloud-images/.bzr/repository/packs/

There are a few things:

1) It certainly appears to have uploaded all of the history of the repository.
2) Bug #465517 is that it was pushing the whole repository, not the whole 
ancestry of a given branch. Eg, I have bzr-rewrite in the same repository as 
bzr. bug #465517 was that 'bzr push' && ^C && 'bzr push' would try to push up 
all of *bzr* into the *bzr-rewrite* target.
3) Because of the ^C and re-push, the branch did not end up stacked on the 
development focus:
http://bazaar.launchpad.net/~ubuntu-on-ec2/live-build/cloud-images/.bzr/branch/branch.conf
(there should be a 'stacked_on_location' there.)
4) The bug is that the second 'bzr push' doesn't see that it should be stacked 
by-default. I believe the cause is:

 a) The config stating that it should be stacked is a virtual file in 
~/ubuntu-on-ec2/ (AIUI). We fake a .bzr/control.conf file.
 b) After the first push, we have created the .bzr/ directory and 
.bzr/repository but *not* the .bzr/branch. So the first process does see that 
the branch should be stacked, but it won't create that branch until the 
repository fetch has finished.

We create the branch last because we didn't want a psuedo-branch to
confuse things. The branch can't say that it is at the target tip
revision, because that content has not been pushed to the repository
yet. However, I think we've had enough experience to show that we can
probably just set the branch tip to 'null:', finish the fetch, and then
update the branch tip to the target revision.

I don't think this needs to be critical, because it isn't any sort of
regression. We've been doing since stacked branches were first created.

** Changed in: bzr
   Importance: Critical => High

** Changed in: bzr
     Assignee: (unassigned) => canonical-bazaar (canonical-bazaar)

** Summary changed:

- absurd upload size on second push
+ branch not stacked if first push is interrupted

-- 
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/818138

Title:
  branch not stacked if first push is interrupted

To manage notifications about this bug go to:
https://bugs.launchpad.net/bzr/+bug/818138/+subscriptions

-- 
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

Reply via email to