SitePoint Sponsor

User Tag List

Results 1 to 2 of 2
  1. #1
    SitePoint Wizard triexa's Avatar
    Join Date
    Dec 2002
    Location
    Canada
    Posts
    2,476
    Mentioned
    0 Post(s)
    Tagged
    0 Thread(s)

    Can't wrap my head around SVN branches

    Alright, so here's the situation:

    A site is under version control. We'll be doing some pretty major changes so I want to work off a branch for that - easy enough to create. Multiple people would work off this same branch - that's "ok", right?

    My problem is what about once this branch has been created and a bug pops up that needs to be fixed. My assumption is to check out the trunk, make the change, and commit that change to the trunk. The problem I see is that now this fix doesn't exist in the branch, so won't we run into a problem later on when we try to apply the massive amount of changes from the branch into the trunk? We'd be undoing some previously fixed/other committed items...?

    Hope that was follow-able and someone can clarify
    AskItOnline.com - Need answers? Ask it online.
    Create powerful online surveys with ease in minutes!
    Sign up for your FREE account today!
    Follow us on Twitter

  2. #2
    SitePoint Author silver trophybronze trophy
    wwb_99's Avatar
    Join Date
    May 2003
    Location
    Washington, DC
    Posts
    10,653
    Mentioned
    4 Post(s)
    Tagged
    0 Thread(s)
    2 ways to handle this: patching and merging.

    Patching is a great option if it is a pretty limited fix to a few files. Main deal killer is patches don't understaind folders as I understand things.

    Merging is handy if it is a bit more involved and involves multiple files in multiple folders. Just merge the revision into the branch to pick up the updated bits.


Bookmarks

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •