Cannot commit to bound branch
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar Subversion Plugin |
New
|
Undecided
|
Unassigned |
Bug Description
I cannot commit to up-to-date bound svn branch.
I've checked out with "bzr checkout svn+ssh://...." and then trying to make a commit with "bzr commit"
Bzr says:
bzr: ERROR: Bound branch BzrBranch7(
To commit to master branch, run update and then commit.
bzr update does not get any updates.
By adding debug to bzrlib/commit.py nearby lines 565:
# Make sure the local branch is identical to the master
master_info = self.master_
local_info = self.branch.
if local_info != master_info:
raise errors.
(mutter lines added by me)
Then .bzr.log contains following interesting lines:
0.218 preparing to commit
1.630 Local: (12944, 'svn-v4:
1.631 Master: (12946, 'svn-v4:
bzr is version from Debian unstable 2.6.0~bzr6522-1
bzr-svn is from Debian unstable version 1.2.1-1
Hi,
It seems that for some reason the revnos for your branch doesn't match that of upstream. What is the revision number reported when you run "bzr revno -rrevid: svn-v4: 6d7ccb3a- 1f00-0410- ba74-00005ac6b1 99:XXX: 28622 URL-for- remote- svn-server" ?