Jan Pazdziora wrote:
On Thu, May 21, 2009 at 04:23:17PM -0400, Jeff Ortel wrote:
After lengthy discussion it was decided (almost unanimously by attendance) that 
the work
on the pgsql branch would be merged to master without refactoring the commits.  
There

I would appreciate anything you can do to make the merge as clean and smooth as 
possible.

However, I'm concerned that changes (refactoring) made in master that resemble changes made in pgsql will cause a lot of merge conflicts or change the end content. We merged master -> pgsql recently and a merge to master now would have very few (if any) conflicts and a deterministic result.

With that said, if what you're proposing will make the commit/diffs more usable and not introduce tons of merge conflicts or changes to the end content (not even a little) then we should try it. Maybe while I'm on PTO next week you can create a branch off master, do what you're proposing and when you're finished (and I'm back from PTO) we can do a test merge pgsql => yourbranch and see what happens. Then, compare to a test merge pgsql => master.


Will you at least allow me to do the refactoring and to put some of
the changes that you plan to bring in that merge commit to master
before that merge?


_______________________________________________
Spacewalk-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/spacewalk-devel

Reply via email to