On Mon, Mar 2, 2009 at 7:32 PM, Devan Goodwin <dgood...@redhat.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Muhammad: I think you may have accidentally done a master to pgsql > merge for me. :) Ooops :) > > > > http://hosted2.fedoraproject.org/cgit/spacewalk.git/commit/?h=pgsql&id=20a473edd51cf26e19220b8a048b2e250606b047 > > It appears the merge was clean, no conflicts, thus why it was probably > somewhat easy to not realize this was happening. > > I think I've pieced together a way to check the diff of what's changed > in the existing Oracle rhnsat schema, attaching the diff, much smaller > this time around. > > Gurjeet: I think you mentioned the last diff was addressed in the > PostgreSQL schema (sent on Feb 18) but just wanted to confirm. > > Remember that 'git merge SOMETHING' means you're merging 'SOMETHING' > into whatever branch you're currently working on. In this case it was > probably 'git merge master' when it was intended to be 'git merge my > workbranch'. Fortunately we intend to merge in master frequently so no > harm no foul. :) Sigh of relief :) and would be careful in future! > > > Muhammad could you check and make sure the work you were > trying to merge in actually made it? Yeah, the modified files have made into the repo. Regards, Muhammad Farrukh > > > Thanks, > > Devan > > - -- > Devan Goodwin <dgood...@redhat.com> > Software Engineer Spacewalk / RHN Satellite > Halifax, Canada 650.567.9039x79267 > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2.0.9 (GNU/Linux) > > iEYEARECAAYFAkmr7fEACgkQAyHWaPV9my4OuQCg3m3rdpsuSG6zUU8Ke5KW8eD6 > RTAAn0EtlYJ084xZx1NmrgvFJiz6x8Qk > =tPg1 > -----END PGP SIGNATURE----- > > _______________________________________________ > Spacewalk-devel mailing list > Spacewalk-devel@redhat.com > https://www.redhat.com/mailman/listinfo/spacewalk-devel >
_______________________________________________ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
