| commit | daeac1b7b746ee1f81ca84d0f6fc4ebec138be76 | |
| author | Thomas Leonard <talex5@gmail.com> | |
| Fri, 8 Mar 2013 10:19:28 +0000 (8 10:19 +0000) | ||
| committer | Thomas Leonard <talex5@gmail.com> | |
| Fri, 8 Mar 2013 10:19:28 +0000 (8 10:19 +0000) | ||
| tree | 3a93aa7868c95d9452b19f63022c34b470e947ac | treesnapshot (tar.gz zip) |
| parent | 7e7c12c108a077786c48a567e71cb401f4ba5155 | commitdiff |
Fixed bug where merging could result in a "main" attribute overriding the command
If you had:
<group>
<command name='run' path='blah'/>
</group>
and you merged in a new implementation:
<implementation main='main'>
<command name='run' path='blah'/>
</implementation>
you could end up with:
<group>
<command name='run' path='blah'/>
<implementation main='main'/>
</group>
which is wrong, because the main attribute now overrides the command.
If you had:
<group>
<command name='run' path='blah'/>
</group>
and you merged in a new implementation:
<implementation main='main'>
<command name='run' path='blah'/>
</implementation>
you could end up with:
<group>
<command name='run' path='blah'/>
<implementation main='main'/>
</group>
which is wrong, because the main attribute now overrides the command.
| merge.py | diffblobblamehistory | |
| tests/local-main-and-command.xml | [new file with mode: 0644] | blob |
| tests/testlocal.py | diffblobblamehistory |