out of date error committing to a bound branch
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar Subversion Plugin |
Triaged
|
Medium
|
Unassigned |
Bug Description
I have a Bazaar checkout of a Subversion branch hosted at Googlecode.
(http://
I have been trying to merge / pull changes on a third branch on to the checkout branch - in both cases, this fails because bzr thinks that this would require a rewrite of the mainline branch, and I had 'append_
(NOTE: this is already puzzling because AFAICT the checkout was up to date with the Subversion branch prior to doing the merge or pull in both cases, and my changes on the third branch were descendants of the tip of the Subversion branch I was merging / pulling on to).
Anyway, I changed the configuration in 'bazaar.conf' to set 'append_
The following shell transcript should illustrate the problem:-
[ ~/Documents/
[ ~/Documents/
-------
revno: 142
committer: Gerard Murphy <email address hidden>
branch nick: splayTreeOptimi
timestamp: Sat 2010-09-18 18:43:22 +0100
message:
Another tidy-up in preparation for refactoring to split the ternary search tree into a mutually recursive composite tree data structure, which in turn will hopefully allow easy implementation of splaying.
-------
revno: 141
committer: Gerard Murphy <email address hidden>
branch nick: splayTreeOptimi
timestamp: Sat 2010-09-18 13:53:01 +0100
message:
Trivial code reformatting plus removal of some tramp data passed around during test level removal that was previously useful for debugging failures but is now redundant.
-------
revno: 140 [merge]
committer: Gerard Murphy <email address hidden>
branch nick: workingBranch
timestamp: Thu 2010-09-09 20:08:36 +0100
message:
Merged in support for singleton test case values and optimisation of merged partial test vector representations.
-------
revno: 139
committer: Gerard Murphy <email address hidden>
branch nick: workingBranch
timestamp: Sun 2010-05-23 22:32:01 +0100
message:
Reformatted C# source file.
-------
revno: 138 [merge]
committer: Gerard Murphy <email address hidden>
branch nick: workingBranch
timestamp: Sun 2010-05-23 17:01:38 +0100
message:
Merged in fixes and cutovers from branch pipeline: now has some support for test value singletons and fixes for the merged partial test vector representation.
-------
Use --include-merges or -n0 to see merged revisions.
[ ~/Documents/
Tree is up to date at revision 142 of branch https:/
[ ~/Documents/
Tree is up to date at revision 142 of branch https:/
[ ~/Documents/
M development/
M development/
M development/
M development/
M development/
M development/
M development/
All changes applied successfully.
Now on revision 150.
[ ~/Documents/
-------
revno: 150
committer: Gerard Murphy <email address hidden>
branch nick: sentinelCrossPr
timestamp: Sun 2010-10-10 19:59:54 +0100
message:
Now systematically generating all combinations of non-interleaved singleton test variables. This is done without regard of the desired combination strength, which still applies only to test variables with levels.
-------
revno: 149
committer: Gerard Murphy <email address hidden>
branch nick: useMapKeyedByTe
timestamp: Thu 2010-10-07 08:58:01 +0100
message:
Now storing test variable combinations at a given strength in an association list entry keyed by that strength. This makes it a lot easier to follow how strenghs are built up recursively from subtrees, and also allows a transition to supporting zero-strengths for test variable singleton values.
-------
revno: 148
committer: Gerard Murphy <email address hidden>
branch nick: splayTreeOptimi
timestamp: Tue 2010-09-28 23:31:18 +0100
message:
Now using splaying to implement the process of splicing out a nearest neighbour when removing a level that has two non-empty subtrees.
-------
revno: 147
committer: Gerard Murphy <email address hidden>
branch nick: splayTreeOptimi
timestamp: Tue 2010-09-28 20:52:05 +0100
message:
Removed invariant and post condition checks for the time being.
-------
revno: 146
committer: Gerard Murphy <email address hidden>
branch nick: splayTreeOptimi
timestamp: Tue 2010-09-28 20:12:51 +0100
message:
Now splaying on addition as well was successful removal of a level to / from a binary tree of levels.
[ ~/Documents/
bzr: ERROR: Bound branch BzrBranch7(
To commit to master branch, run update and then commit.
You can also pass --local to commit to continue working disconnected.
[ ~/Documents/
All changes applied successfully.
Updated to revision 142 of branch https:/
Your local commits will now show as pending merges with 'bzr status', and can be committed with 'bzr commit'.
[ ~/Documents/
modified:
development/
development/
development/
development/
development/
development/
development/
development/
pending merge tips: (use -v to see all merge revisions)
Gerard Murphy 2010-10-10 Now systematically generating all combinations of non-interleaved singleton test variables. This is done without regard of the desired combination strength, which still applies only to test variables with levels.
[ ~/Documents/
Committing to: https:/
modified development/
modified development/
modified development/
modified development/
modified development/
modified development/
modified development/
modified development/
bzr: ERROR: subvertpy.
Traceback (most recent call last):
File "/Library/
return the_callable(*args, **kwargs)
File "/Library/
ret = run(*run_argv)
File "/Library/
return self.run(
File "/Library/
return self._operation
File "/Library/
self.cleanups, self.func, *args, **kwargs)
File "/Library/
result = func(*args, **kwargs)
File "/Library/
exclude=
File "/Library/
result = unbound(self, *args, **kwargs)
File "/Library/
result = WorkingTree3.
File "/Library/
result = unbound(self, *args, **kwargs)
File "/Library/
*args, **kwargs)
File "/Library/
possible_
File "/Library/
self.cleanups, self.func, self, *args, **kwargs)
File "/Library/
result = func(*args, **kwargs)
File "/Library/
self.
File "/Users/
self.
File "/Users/
overwrite=
File "/Users/
override_
File "/Users/
revid = builder.
File "/Users/
raise convert_error(e)
SubversionExcep
bzr 2.2.1 on python 2.6.1 (Darwin-
arguments: ['/usr/
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'en_GB.UTF-8'
plugins:
bash_completion /Library/
bzrtools /Library/
colo /Library/
email /Library/
explorer /Library/
extmerge /Library/
fastimport /Library/
keychain /Library/
launchpad /Library/
loom /Library/
netrc_
news_merge /Library/
pipeline /Library/
qbzr /Library/
rewrite /Library/
svn /Users/
upload /Library/
xmloutput /Library/
*** Bazaar has encountered an internal error. This probably indicates a
bug in Bazaar. You can help us fix it by filing a bug report at
https:/
including this traceback and a description of the problem.
NOTE: as additional information, the third branch 'pipelineOverWo
My setup is Bazaar 2.2.1 under MacOSX with bzr-svn obtained as an explicit plugin from the Launchpad branch 'lp:bzr-svn svn'.
This seems related to the discussion at the end of bug #118787.
summary: |
- bzr-svn crashes when attempting to commit local changes on checkout + out of date error committing to a bound branch |
Changed in bzr-svn: | |
status: | New → Triaged |
importance: | Undecided → Medium |
NOTE: I have 'push_merged_ revisions' set to 'True' in my 'subversion.conf' file in addition to the setting for 'append_ revisions_ only' described above, if this is relevant.