non-HEAD branch access only works for newer versions of bzr
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar Git Plugin |
Fix Released
|
Low
|
Jelmer Vernooij |
Bug Description
In https:/
Here's what I did:
bzr git-import git://git.
cd gawk-branches/
bzr checkout
This created a working tree. A few hours later there was a commit to this branch, so I tried "bzr pull" in it, but bzr errored out:
D:\gnu\
Using saved parent location: git://git.
bzr: ERROR: These branches have diverged. Use the missing command to see how.
Use the merge command to reconcile them.
The backtrace from .bzr.log is below.
"bzr merge" did work. But since I made no changes in that branch, I expect "pull" to work.
Also, trying "bzr missing" says that this command isn't supported by the Git smart server protocol. Which is fine, but then why is that command suggested in the first place?
Here's the backtrace from the failed "bzr pull":
Tue 2011-11-08 22:32:48 +0200
0.156 bazaar version: 2.4.2
0.156 bzr arguments: [u'pull']
0.219 looking for plugins in C:/Documents and Settings/
0.219 looking for plugins in D:/usr/
0.422 encoding stdout as sys.stdout encoding 'cp1252'
0.531 opening working tree 'D:/gnu/
3.281 Importing 0 new revisions
3.281 Packing repository GCRepositoryPac
3.516 Transferred: 3kB (4.0kB/s r:3kB w:0kB)
3.516 Traceback (most recent call last):
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "D:/usr/
File "D:/usr/
File "D:/usr/
File "bzrlib\
File "bzrlib\
DivergedBranches: These branches have diverged. Use the missing command to see how.
Use the merge command to reconcile them.
Related branches
summary: |
- Cannot "bzr pull" in a non-master branch created by git-import + non-HEAD branch access only works for newer versions fo bzr |
summary: |
- non-HEAD branch access only works for newer versions fo bzr + non-HEAD branch access only works for newer versions of bzr |
Changed in bzr-git: | |
status: | Fix Committed → Fix Released |
> "bzr merge" did work.
Actually, I take that back: it didn't work well. First, it produced text conflicts:
Text conflict in configure
Text conflict in configure.ac
Text conflict in doc/gawk.info
Text conflict in version.c
4 conflicts encountered.
And also it modified much more files than I expected. (I knew what to expect because I receive email notifications about commits to Gawk branches.)
I guess it simply tried to merge master onto gawk-4.0-stable. Even though it says
Merging from remembered parent location git://git. savannah. gnu.org/ gawk.git, ref=refs% 2Fheads% 2Fgawk- 4.0-stable
which seems to be a lie.