James Westby wrote:
> On Wed Dec 09 01:37:38 UTC 2009 Martin Pool wrote:
>>> What should I do to resolve it, except just doing "bzr resolve misc",
>> as that's all I can see to do?
>>
>> Did that work?
>
> Yes.
>
>> It may be that the problem is there are ignored files inside misc,
>
> Well, I just did branch+merge-package, so I don't think that's the
> reason. Also, there's no .other or anything.
>
> Thanks,
>
> James
>
I can't reproduce this. If I do:
bzr co lp:debian/smarty debian \
-r revid:<email address hidden>
bzr co lp:ubuntu/smarty ubuntu \
-r revid:<email address hidden>
# Note that this is rev 16, not the rev 17 tip, since that has already
# merged debian
cd ubuntu
bzr merge ../debian
$ bzr st
removed:
misc/
misc/smarty_icon.README
misc/smarty_icon.gif
unit_test/
unit_test/README
unit_test/cache/
unit_test/config.php
unit_test/configs/
unit_test/configs/globals_double_quotes.conf
unit_test/configs/globals_single_quotes.conf
unit_test/smarty_unit_test.php
unit_test/smarty_unit_test_gui.php
unit_test/templates/
unit_test/templates/assign_var.tpl
unit_test/templates/constant.tpl
unit_test/templates/index.tpl
unit_test/templates/parse_math.tpl
unit_test/templates/parse_obj_meth.tpl
unit_test/templates_c/
unit_test/test_cases.php
modified:
NEWS
README
debian/Makefile
debian/changelog
libs/Config_File.class.php
libs/Smarty.class.php
libs/Smarty_Compiler.class.php
unknown:
debian/changelog.BASE
debian/changelog.OTHER
debian/changelog.THIS
conflicts:
Text conflict in debian/changelog
pending merge tips: (use -v to see all merge revisions)
Thijs Kinkhorst 2009-10-24 [merge] * Non-maintainer upload.
So there is a conflict in debian/changelog, and 'misc' has been removed,
but no other problems.
Now if I do: touch misc/temp-file
And then do the merge, I get:
Conflict: can't delete misc because it is not empty. Not deleting.
Which seems sane enough. And doing "bzr resolve misc" will resolve that
conflict.
Perhaps 'merge-package' is doing something fancier which is causing the
breakage?
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
James Westby wrote: merge-package, so I don't think that's the
> On Wed Dec 09 01:37:38 UTC 2009 Martin Pool wrote:
>>> What should I do to resolve it, except just doing "bzr resolve misc",
>> as that's all I can see to do?
>>
>> Did that work?
>
> Yes.
>
>> It may be that the problem is there are ignored files inside misc,
>
> Well, I just did branch+
> reason. Also, there's no .other or anything.
>
> Thanks,
>
> James
>
I can't reproduce this. If I do:
bzr co lp:debian/smarty debian \
-r revid:<email address hidden>
bzr co lp:ubuntu/smarty ubuntu \
-r revid:<email address hidden>
# Note that this is rev 16, not the rev 17 tip, since that has already
# merged debian
cd ubuntu
bzr merge ../debian
$ bzr st smarty_ icon.README smarty_ icon.gif test/config. php test/configs/ test/configs/ globals_ double_ quotes. conf test/configs/ globals_ single_ quotes. conf test/smarty_ unit_test. php test/smarty_ unit_test_ gui.php test/templates/ test/templates/ assign_ var.tpl test/templates/ constant. tpl test/templates/ index.tpl test/templates/ parse_math. tpl test/templates/ parse_obj_ meth.tpl test/templates_ c/ test/test_ cases.php Config_ File.class. php Smarty. class.php Smarty_ Compiler. class.php changelog. BASE changelog. OTHER changelog. THIS
removed:
misc/
misc/
misc/
unit_test/
unit_test/README
unit_test/cache/
unit_
unit_
unit_
unit_
unit_
unit_
unit_
unit_
unit_
unit_
unit_
unit_
unit_
unit_
modified:
NEWS
README
debian/Makefile
debian/changelog
libs/
libs/
libs/
unknown:
debian/
debian/
debian/
conflicts:
Text conflict in debian/changelog
pending merge tips: (use -v to see all merge revisions)
Thijs Kinkhorst 2009-10-24 [merge] * Non-maintainer upload.
So there is a conflict in debian/changelog, and 'misc' has been removed,
but no other problems.
Now if I do: touch misc/temp-file
And then do the merge, I get:
Conflict: can't delete misc because it is not empty. Not deleting.
Which seems sane enough. And doing "bzr resolve misc" will resolve that
conflict.
Perhaps 'merge-package' is doing something fancier which is causing the
breakage?
John enigmail. mozdev. org/
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAks f5J4ACgkQJdeBCY SNAAMX2gCgtzEgy kWek1D6YsqHmu9t dCt3 Ir55rcmitefWfrm oWkOb
O+IAoIXzCjI+
=cXkp
-----END PGP SIGNATURE-----