bzr merge failure

Gavin Carr gavin at openfusion.com.au
Fri Jul 31 08:08:58 BST 2009


I'm getting a weird merge failure under bzr 1.17 (on linux), which I'm 
guessing is due to weird characters in filenames. 

I've got a feature branch I'm trying to merge to mainline, so it's all 
committed fine, and 'bzr missing' works, but merge fails:

  nox:~/work/brackup/upstream$ bzr missing --theirs-only ../escape
  You are missing 3 revision(s):
  ------------------------------------------------------------
  revno: 52
  committer: Gavin Carr <gavin at openfusion.com.au>
  branch nick: escape
  timestamp: Fri 2009-07-31 08:06:17 +1000
  message:
    Add Changes entry.
  ------------------------------------------------------------
  revno: 51
  committer: Gavin Carr <gavin at openfusion.com.au>
  branch nick: escape
  timestamp: Wed 2009-07-29 21:37:30 +1000
  message:
    Add t/05-filename-escaping.t unit test and data to MANIFEST.
  ------------------------------------------------------------
  revno: 50
  committer: Gavin Carr <gavin at openfusion.com.au>
  branch nick: escape
  timestamp: Wed 2009-07-29 18:30:09 +1000
  message:
    Add t/05-filename-escaping.t unit test, and t/data_weird_filenames data directory.

  nox:~/work/brackup/upstream$ bzr merge -r50 -v -v ../escape
  bzr: ERROR: not well-formed (invalid token): line 90, column 81 


and the merge fails with return code 3, bzr st shows no changes.

I may have got this error (or something like it) on commit too, but it
appeared to succeed, so I may just have ignored it.

The feature branch is testing escaping of weird filename characters,
which I suspect is the cause of the problem. The unit test data 
directory looks like:

  nox:~/work/brackup/escape$ tree t/data_weird_filenames/
  t/data_weird_filenames/
  |-- 000-dup1.txt
  |-- 000-dup2.txt
  |-- filename^Lformfeed
  |-- filename^Mcarriage^Mreturn
  |-- filename whitespace
  |-- filename_ctrl_c^C
  |-- filename_newline
  |-- filename_tab
  |-- huge-file.txt
  |-- my-link.txt -> test-file.txt
  `-- my_^Ldir
      `-- sub_dir
          |-- another-file.txt
          `-- program.sh


and adding that tree is the main content of revision 50.

Any ideas?

Cheers,
Gavin




More information about the bazaar mailing list