• View
  • Changes
  • Options
  • Related
  • Edit
  • Download | Support | Changelogs

     

    Documentation:

    General Information

    Introduction | Overview | Features | Goals and Scope | FAQ Installation | Running an ACE Server | Tracking Problems

     

    Community Information

    About Us (contact) | Compatible Mods | Contribute | Guides | Missions | Servers | Videos

     

    Developer Information

    API | Classlists | Compatibility | Modification | Resources

     

  • View
  • Changes
  • Options
  • Related
  • Edit
  • News    

    Ongoing development Wagn_feed_icon-medium-9343

       ACE 1.13 RC5 [2011-12-09. Hotfix: 2012-04-27]

     

    Stable Wagn_feed_icon-medium-9343

       ACE 1.13 for OA [2011-12-23]

       ACE 1.3 for A2 [2010-07-05] (Deprecated)

     

    Dev blogs Wagn_feed_icon-medium-9343

    1 2 next » (37)

    1 2 next » (37)

     

    Wheeled by Wagn v. 1.8.1
  • View
  • Changes
  • Options
  • Related
  • Edit
  • Also see Branching.

     

    Patching can be used to let others work on your repository, without write access.

    In essence they will clone a read-only version of your repository.

    The idea is that the develop/stable branch never is touched on the user's computer. these branches should always be up2date with the latest what is on the server, and never be edited by the user.

     

     

    The user should create a seperate branch, let's say: feature/mycoolfeature. Make absolutely sure this branch is created on top of official repository commits.

    Once in the branch, do the work and commit your changes step by step.

    Once done, pull in latest changes, rebase the branch on top of the latest changes and generate a patch (Git Extensions, Commands, Format Patch).

     

     

    The important part here is that the patch (/branch) is never based on custom commits from the user, but always on official revisions that exist in origin/develop.

    Otherwise the patch can simply not be applied to the official repo.

     

     

    Send the patch by mail or whatever is preferred, for testing/reference, and to be implemented by someone with write access.

    Generally they'd be creating the same kind of feature branch, import your patch, verify it's working, and merge it to the develop branch.

     

     

    Creating Patches

    • Pull latest from Repository, if you made own customizations, please use rebase, not merge!
    • Create feature branch:
    git flow feature start somefeature
    • Commit your work
    • Confirm your work
    • Create patch, and send it upstream.

     

    Applying Patches

    Note: --ignore-space-change required to apply patches in Windows when core.autocrlf == false

    • Create feature branch:
    git flow feature start somefeature
    • Apply Patch (Git extensions, commands, apply patch) (git am -3 patchfile.patch --ignore-space-change)
    • Test, confirm.
    • Merge back:
    git flow feature finish somefeature