×
INTELLIGENT WORK FORUMS
FOR COMPUTER PROFESSIONALS

Log In

Come Join Us!

Are you a
Computer / IT professional?
Join Tek-Tips Forums!
  • Talk With Other Members
  • Be Notified Of Responses
    To Your Posts
  • Keyword Search
  • One-Click Access To Your
    Favorite Forums
  • Automated Signatures
    On Your Posts
  • Best Of All, It's Free!
  • Students Click Here

*Tek-Tips's functionality depends on members receiving e-mail. By joining you are opting in to receive e-mail.

Posting Guidelines

Promoting, selling, recruiting, coursework and thesis posting is forbidden.

Students Click Here

Cvs merge Issue

Cvs merge Issue

Cvs merge Issue

(OP)
Hello,

We are using cvs for version control.
The trunk is obsoleted for now, as it contains more than necessary code.

The trunk has two sub-branches, one for on-going development & one for the release branch.

the development branch is where the ongoing development happens and release branch where files are merged & patches are created & released to customer.

On an average i create 2-5 patches in a day.
So, i merge the changes from development to release branch, using the End tag as the developers tag.
I use the tag as End tag instead of the branch as the correct versions must go into the patches rather than the latest versions.

however this merging has become an issue, as manual merging is prone to errors & there are chanches of skipping files etc. In addition the time i take for one patch creation is gone up.

In addition to this developer create a tag after committing their work, but sometimes the tags are applied & there would have been no errors.


Does some one out there use a similiar process? any suggestion on how the merge step can can be improved/ automated & mistakes avoided?

Are there any issues, merging regularly from one sub-branch to another & using a tag.

note: i have to create each patch seperately & cannot combine them into one, as they are applied at different times on approval.

Thanks,
Nal







Red Flag This Post

Please let us know here why this post is inappropriate. Reasons such as off-topic, duplicates, flames, illegal, vulgar, or students posting their homework.

Red Flag Submitted

Thank you for helping keep Tek-Tips Forums free from inappropriate posts.
The Tek-Tips staff will check this out and take appropriate action.

Reply To This Thread

Posting in the Tek-Tips forums is a member-only feature.

Click Here to join Tek-Tips and talk with other members! Already a Member? Login

Close Box

Join Tek-Tips® Today!

Join your peers on the Internet's largest technical computer professional community.
It's easy to join and it's free.

Here's Why Members Love Tek-Tips Forums:

Register now while it's still free!

Already a member? Close this window and log in.

Join Us             Close