Advertisement
If you have a new account but are having problems posting or verifying your account, please email us on hello@boards.ie for help. Thanks :)
Hello all! Please ensure that you are posting a new thread or question in the appropriate forum. The Feedback forum is overwhelmed with questions that are having to be moved elsewhere. If you need help to verify your account contact hello@boards.ie
Hi there,
There is an issue with role permissions that is being worked on at the moment.
If you are having trouble with access or permissions on regional forums please post here to get access: https://www.boards.ie/discussion/2058365403/you-do-not-have-permission-for-that#latest

Subversion structure advice needed

  • 12-03-2011 3:30pm
    #1
    MOH
    Registered Users, Registered Users 2 Posts: 6,465 ✭✭✭


    I'm just getting started with Subversion, and I'm running into a problem with the way my code is structured.

    I'm working on a Magento site, which on a simplified basis works something like this: 
    \code
    \core
    \local
\template
    \core
    \local
\...etc
    \core
    \local

    If you want to change something in the core, you take a copy to the local folder and do it there - you set up whatever subfolders are needed under \local to match the path to the \core file. When the system needs anything, it looks in local first and uses the file there, or falls back to core.

    To upgrade, you just extract the latest release files overwriting everything in the core.

    My problem is that if I have a copy of a file in \local, and it gets upgraded in \core, I need to merge those changes back into my local version.

    I can't just create the local as the trunk and the core as a branch, because I'm editing in different trees than the core edits.

    They provide diff files as part of the release, but again, I'm in a different tree.

    What I seem to need is some way of mapping folders - saying changes in this tree need to be applied to that tree. I'm sure there's some standard way of doing this that I'm missing.


Comments

  • #2
    Malice
    Registered Users, Registered Users 2 Posts: 15,065 ✭✭✭✭Malice


    Just so I make sure I'm understanding the problem, is it that you are working on two different branches at the same time and having problems merging with the head?


  • #3
    MOH
    Registered Users, Registered Users 2 Posts: 6,465 ✭✭✭MOH


    No, the problem (I think) is that I'm working in a parallel set of folders.

    There's core code, that I'll never change, in e.g.
    code\core\path\to\file
    template\core\...
    somethingelse\core\...

    I've got my own versions of some files in:
    code\local\path\to\file
    template\local\...
    somethingelse\local\...

    If the core gets upgraded, then when I get the new release, for any core files for which I have local copies, I need to merge the core differences into my local copies.


Advertisement