Announcement

Collapse
No announcement yet.

I'm a subversion novice and need to do double commits

Collapse
X
  • Filter
  • Time
  • Show
Clear All
new posts

  • I'm a subversion novice and need to do double commits

    I'm working on a project (I'm not the admin) that has branched from the trunk and I need to continually keep both the trunk and branch updated. I understand I'm suppose to do double commits but I'm worried that won't work. I thought that the local .svn directory kept a copy of what is currently on the server at just one revision. If I "switch" to a different root (that is, change from branch to trunk), won't my commit be confused?

    thanks

  • #2
    You don't do "double commits". You commit your work to either branch or trunk, then periodically merge your changes between them.

    If you are constantly committing identical changes to both, there's not much point to maintaining 2 separate lines. Generally you merge on a schedule or based upon pre-determined criteria, not on every change.

    You really ought to read the manual's Branching & Merging chapter.

    Comment

    Working...
    X