Skip to content
  • Categories
  • Recent
  • Tags
  • Popular
  • World
  • Users
  • Groups
Skins
  • Light
  • Cerulean
  • Cosmo
  • Flatly
  • Journal
  • Litera
  • Lumen
  • Lux
  • Materia
  • Minty
  • Morph
  • Pulse
  • Sandstone
  • Simplex
  • Sketchy
  • Spacelab
  • United
  • Yeti
  • Zephyr
  • Dark
  • Cyborg
  • Darkly
  • Quartz
  • Slate
  • Solar
  • Superhero
  • Vapor

  • Default (No Skin)
  • No Skin
Collapse
Code Project
  1. Home
  2. The Lounge
  3. Subversion Question

Subversion Question

Scheduled Pinned Locked Moved The Lounge
questionannouncement
8 Posts 5 Posters 0 Views 1 Watching
  • Oldest to Newest
  • Newest to Oldest
  • Most Votes
Reply
  • Reply as topic
Log in to reply
This topic has been deleted. Only users with topic management privileges can see it.
  • M Offline
    M Offline
    mobius111001
    wrote on last edited by
    #1

    I have a tag for my last released version of software. Prior to this, a branch was created. After the last release, it was said no more of that version and the branch was merged into the trunk. As it turns out, we need to make another release of that version. What is the correct way to accomplish this? Do I make a tag of that tag or something else?

    P P R 3 Replies Last reply
    0
    • M mobius111001

      I have a tag for my last released version of software. Prior to this, a branch was created. After the last release, it was said no more of that version and the branch was merged into the trunk. As it turns out, we need to make another release of that version. What is the correct way to accomplish this? Do I make a tag of that tag or something else?

      P Offline
      P Offline
      peterchen
      wrote on last edited by
      #2

      Use GIT. Whenever I asked a VSS question, the majority of replies were "switch to SVN". This is my chance to get back at you all! Muhahahahhahahahacoughsputterhahahaha!

      Agh! Reality! My Archnemesis![^]
      | FoldWithUs! | sighist | µLaunch - program launcher for server core and hyper-v server.

      R 1 Reply Last reply
      0
      • P peterchen

        Use GIT. Whenever I asked a VSS question, the majority of replies were "switch to SVN". This is my chance to get back at you all! Muhahahahhahahahacoughsputterhahahaha!

        Agh! Reality! My Archnemesis![^]
        | FoldWithUs! | sighist | µLaunch - program launcher for server core and hyper-v server.

        R Offline
        R Offline
        Rage
        wrote on last edited by
        #3

        peterchen wrote:

        Use GIT.

        Are you ? If yes, what do you think about it ?

        P 1 Reply Last reply
        0
        • M mobius111001

          I have a tag for my last released version of software. Prior to this, a branch was created. After the last release, it was said no more of that version and the branch was merged into the trunk. As it turns out, we need to make another release of that version. What is the correct way to accomplish this? Do I make a tag of that tag or something else?

          P Offline
          P Offline
          PIEBALDconsult
          wrote on last edited by
          #4

          Restore from a backup? :-D

          1 Reply Last reply
          0
          • R Rage

            peterchen wrote:

            Use GIT.

            Are you ? If yes, what do you think about it ?

            P Offline
            P Offline
            peterchen
            wrote on last edited by
            #5

            steep ugly learning curve, unfriendly tools, but becoming fun to use. (...if you have someone to ask for help when it "does strange things" )

            Agh! Reality! My Archnemesis![^]
            | FoldWithUs! | sighist | µLaunch - program launcher for server core and hyper-v server.

            1 Reply Last reply
            0
            • M mobius111001

              I have a tag for my last released version of software. Prior to this, a branch was created. After the last release, it was said no more of that version and the branch was merged into the trunk. As it turns out, we need to make another release of that version. What is the correct way to accomplish this? Do I make a tag of that tag or something else?

              R Offline
              R Offline
              Rage
              wrote on last edited by
              #6

              If I read this correctly, your branch has become your trunk. So no tag is necessary.

              M 1 Reply Last reply
              0
              • R Rage

                If I read this correctly, your branch has become your trunk. So no tag is necessary.

                M Offline
                M Offline
                mobius111001
                wrote on last edited by
                #7

                Maybe I explained it poorly. Let's say I have versions 1.0, 1.1, and 1.2. During 1.2 development in trunk, 1.1 was branched out for 2.0. Once 1.2 was final, it was tagged. This was suppose to be the last ever version for the 1.x series. 2.0 was then merged back into trunk and there has been changes since. I now need to make a 1.3.

                D 1 Reply Last reply
                0
                • M mobius111001

                  Maybe I explained it poorly. Let's say I have versions 1.0, 1.1, and 1.2. During 1.2 development in trunk, 1.1 was branched out for 2.0. Once 1.2 was final, it was tagged. This was suppose to be the last ever version for the 1.x series. 2.0 was then merged back into trunk and there has been changes since. I now need to make a 1.3.

                  D Offline
                  D Offline
                  Dan Neely
                  wrote on last edited by
                  #8

                  I'd say create a new branch either right where 1.2 was merged into 2.0, or from the last commit on the 1.2 branch. I'm assuming that all the the 2.0 changes are going to stay 2.0.

                  3x12=36 2x12=24 1x12=12 0x12=18

                  1 Reply Last reply
                  0
                  Reply
                  • Reply as topic
                  Log in to reply
                  • Oldest to Newest
                  • Newest to Oldest
                  • Most Votes


                  • Login

                  • Don't have an account? Register

                  • Login or register to search.
                  • First post
                    Last post
                  0
                  • Categories
                  • Recent
                  • Tags
                  • Popular
                  • World
                  • Users
                  • Groups