w-changeset: merge errors out

[Aaron Bentley]

Could you please send that as an attachment?  Trying to restore the 
exact text from your HTML email is rather tricky.

Aaron

John Dong wrote:
> I think the following (gasp) changeset does the trick. (you know I'm 
> just finding an excuse to play with changesets)
> 
> 
> # Bazaar changeset v0.7
> #
> # message:
> #   Add another package to setup.py
> #
> # committer: John Dong < john.dong at gmail.com <mailto:john.dong at gmail.com>>
> # date: Fri 2006-05-19 13:49:52.177897930 -0400
> 
> === modified file setup.py
> --- setup.py
> +++ setup.py
> @@ -112,6 +112,8 @@
>                  ' bzrlib.util.elementtree',
>                  'bzrlib.util.effbot.org <http://bzrlib.util.effbot.org>',
>                  'bzrlib.util.configobj',
> +               'bzrlib.changeset',
> +               'bzrlib.changeset.serializer '
>                  ],
>        scripts=['bzr'],
>        cmdclass={'install_scripts': my_install_scripts, 'build': bzr_build},
> 
> # revision id: john.dong at gmail.com-20060519174952-448b99a00c08f4dc 
> <mailto:john.dong at gmail.com-20060519174952-448b99a00c08f4dc>
> # sha1: 532ad41fd673cdf8247d824e8c4f2164b6898d2e
> # inventory sha1: 3f711e9d7d5e5647c71b77fa5c69c625cdf6711d
> # parent ids:
> #   john.dong at gmail.com-20060519174702-b29d15e9b920e057 
> <mailto:john.dong at gmail.com-20060519174702-b29d15e9b920e057>
> # base id: aaron.bentley at utoronto.ca-20060519120905-e96996d16777e5ea 
> <mailto:aaron.bentley at utoronto.ca-20060519120905-e96996d16777e5ea>
> # properties:
> #   branch-nick: w-changeset
> 
> # message:
> #   Install changeset
> # committer: John Dong <john.dong at gmail.com <mailto:john.dong at gmail.com>>
> # date: Fri 2006-05-19 13:47:02.264086008 -0400
> 
> === modified file setup.py
> --- setup.py
> +++ setup.py
> @@ -112,6 +112,7 @@
>                  'bzrlib.util.elementtree',
>                  'bzrlib.util.effbot.org <http://bzrlib.util.effbot.org> ',
>                  'bzrlib.util.configobj',
> +               'bzrlib.changeset'
>                  ],
>        scripts=['bzr'],
>        cmdclass={'install_scripts': my_install_scripts, 'build': bzr_build},
> 
> # revision id: john.dong at gmail.com-20060519174702-b29d15e9b920e057 
> <mailto:john.dong at gmail.com-20060519174702-b29d15e9b920e057>
> # sha1: 7252d25989c0fda3df1bc48162ccc0dcc21db07a
> # inventory sha1: 58a5e6c32db5eac075ca3048c21cc143f635461e
> # parent ids:
> #   aaron.bentley at utoronto.ca-20060519120905-e96996d16777e5ea 
> <mailto:aaron.bentley at utoronto.ca-20060519120905-e96996d16777e5ea>
> # properties:
> #   branch-nick: w-changeset
> 
> 
> 
> 
> 
> On 5/20/06, *John Dong* <jdong at ubuntu.com <mailto:jdong at ubuntu.com>> wrote:
> 
>     Also, can you modify your setup.py to install bzrlib.changeset and
>     any other sub-modules?
> 
>