Bazaar Git Plugin

  1. Bug #887785
  2. Comment #1

Comment 1 for bug 887785

Revision history for this message
Eli Zaretskii (eliz) wrote : Re: Cannot "bzr pull" in a non-master branch created by git-import

> "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.