On Wed, Nov 09, Adrian Schröter wrote:
Am Mittwoch, 9. November 2011, 11:32:56 schrieb Olaf Hering:
Yesterday I accidently ran commit in the Virtualization directory instead of the Virtualization/xen directory. This lead to unexpected commits in kvm, libvirt, libvirt-cim, libyajl and open-ovf packages because some script decided to reformat the rpm specfiles.
Now the libyajl and open-ovf packages have conflicts which I cant seem to revert.
The conflict is in libyajl.spec file, this has nothing to do with server side changes.
There were zero local changes in libyajl and other directory, only xen.spec had a change. Still, some packages were updated anyway. That looks like a bug to me, the current behaviour leads to unexpected changes.
If someone could please revert the damage and restore the previous content in libyajl and open-ovf, that would be great.
what about just doing a "osc copypac -r$REV" your self ?
osc copypac -r 7 -m 'restore rev 7' `cat .osc/_project` libyajl `cat .osc/_project` That appears to work, thanks. Olaf -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org