Loading ...
Sorry, an error occurred while loading the content.

Re: [pcgen_developers] UI Merge Begins

Expand Messages
  • Stefan Radermacher
    Sounds exciting. I m thrilled to se how it goes. Regards, Stefan.
    Message 1 of 3 , Feb 3, 2012
      Sounds exciting. I'm thrilled to se how it goes.


      On 03.02.2012 13:19, James Dempsey wrote:
      > Hi,
      > Well merging a year's worth of trunk changes into the branch hasn't gone
      > so bad thus far. I'm following the process recommended in the SVN red
      > book
      > <http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html>
      > [1] for merging. The general idea is to bring the branch up to date with
      > the trunk first, then once that is working and up to date, push it back
      > to the trunk.
      > From over 1700 files changed, I hit only 34 conflicts in files and 7
      > tree conflicts. These are all resolved locally now, mostly they were
      > collisions between class renames or moves in the branch with constant
      > renames in trunk. Only a handful required any serious investigation.
      > Next stage will be resolving compile issues left over and doing some
      > testing. Once that is done, I'll start the bulk check-ins to the branch,
      > then do another sync for the trunk changes in the meantime and once I
      > have caught up push the changes back to trunk.
      > Cheers,
      > James.
      > [1] http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html
      > On 2/02/2012 8:29 PM James Dempsey wrote
      >> Hi,
      >> I'm starting work on the merge of the new user interface into trunk.
      >> That means the uisync branch is now frozen and there will be no further
      >> work there.
      >> I'll be doing some extensive commits to trunk in the next few days and
      >> there is a chance that the tests may be broken from time to time. I'll
      >> aim not to check in code that breaks the build though :)
      >> Cheers,
      >> James Dempsey
      >> PCGen Code SB
    Your message has been successfully submitted and would be delivered to recipients shortly.