Am Freitag, 14. Mai 2010, 20:58:39 schrieb Petr Mladek:
Hi Petr, I know it's hard, but what I want to thank you most for is bringing this up to give everyone a chance to improve the situation instead of you suffering silently.
Questions and hints:
+ do I anything wrong?
The only thing I can see wrong here is that your OpenOffice_org-icon-themes conflict shouts "old osc!" to me - the new one uses a better merging that should have catched this case.
+ is there a better supported workflow? + do we really need to update license, release tags, header in the factory repo? I think we need to as it brings some consistency to our spec files and not everyone names its license differently.
The license and the header shouldn't change that often and the release tag should only change
+ would be possible to call prepare spec locally before or during "osc commit"? It would be possible for you, but it shouldn't be neccessary.
+ does anyone understand the 2 level conflicts "a" and "f"? + is it possible that the merge functionality is broken?
You know, it sounds a bit crazy if I am the only one doing changes in the OOo packages and still have to resolve conflicts :-)
Please, do not tell me that I should wait for commit into factory before doing more changes ;-) No, this is definitely not wanted. What I don't understand how you can get conflicts in release tag if factory is the only repo where it changes.
Running osc pull could be part of the work flow and shouldn't worry you - only if it creates conflicts you have to resolve manually it's a problem IMO. So my suggestion to your work flow would be: - use osc 0.126 - run osc pull after you're ware of factory checkins Greetings, Stephan -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org