Still celebrating National IT Professionals Day with 3 months of free Premium Membership. Use Code ITDAY17

x

Version Control

Version control, also known as revision control or source control, is the management of changes to documents, computer programs, large web sites, and other collections of information. Changes are usually identified by a number or letter code, termed the "revision number," "revision level," or simply "revision." Version control systems (VCS) most commonly run as stand-alone applications, but revision control is also embedded in various types of software such as word processors and spreadsheets, and in various content management systems. Revision control allows for the ability to revert a document to a previous revision. Git, a widely-used VCS, has its own topic; other popular systems include CVS, Subversion, Team Foundation Server (TFS), Visual SourceSafe (VSS) and Perforce.

Share tech news, updates, or what's on your mind.

Sign up to Post

Hello,
On my previous positions, I worked in a pretty big IT development department where we used SVN for version control.
So for each 'ticket', whether for a production bug, enhancement or new development, we would create a branch off of the SVN trunk for a 'Release'.  
We would attach our scripts to this branch to be deployed to the QUAL and Production environments. (check back these branches back into the trunk)
Anyways, it was a good system to have when organizing different releases to different applications, systems and databases.
We used different languages, mostly c#, VB and sometimes, PowerBuilder.  We also used Oracle and Sql Server as well.

My current job, in our little development shop we use TFS for our version control.
I'd like to create some kind of script or organize what specific Oracle or Sql Server objects that a DBA can run for us, to say the
QUAL environment and eventually to Production.  Also for any SSIS packages and c# solutions that would need to be deployed as well.

Does TFS or some other tool available we can use to do this?

Thanks
0
New feature and membership benefit!
LVL 10
New feature and membership benefit!

New feature! Upgrade and increase expert visibility of your issues with Priority Questions.

Hello Experts,
I am trying to create new Repository in Sub Version Source Control.  I have already created the new folder and trying to Import the project.  But it fails every time at a folder called js.  Inside  js I have 2 files as below (downloaded related to jQuery PlugIn).  When I Imported the project in a smaller slots (like few folders at a time) it worked except the following 2 files.  Any idea what is causing it.  Please help!

jquery-ui.js
jquery-1.12.4.js

Thank you very much in advance.
0
I have a form I built in Sharepoint 2010 tied to a List.  I have version control turned on and for one key field I utilize the Append function to track history.  This is great, however when I export I am aware of a known limitation that only the last update is exported.  My challenge is that I have users that update this key field and then come back and make a change to the form (not including the key field).  This results in blank data when exported.  

Question: Is there a way to include detail from the last 2 versions when exporting to excel?
0
My current problem is that I'm trying to push new files to our project's dev server and each time I make a commit with SVN, this error is popping up: " error MSB3541: Files has invalid value "<<<<<<< .mine". Illegal characters in path. ".

I did a little bit of research and found that this is a warning that SVN gives when it tries to merge two disparate files. The ".mine" is added to the data of the file along with a ".yours" section to show the changes and allow the user to manually edit out the conflicts on the file.

However, whenever I try to edit the .dll file in question TortoiseSVN gives me an error message saying that this type of file can not be edited. I've tried recompiling the project's dll's, deleting the obj and bin folders to force the project to rebuild the offending directory, used old .dll files from an earlier version, recompiled the dll's on the other computer that has access to this repository, unloading and reloading the project that contains the dll file in question, and building the entire project. So far nothing has returned a solution. Each time I push the newly built files the same error pops up.


Is there a way to edit out a conflict of this nature on a .dll file or am I missing something very obvious?
0
Hello

Let's say i narrow the language in github search. I further want to specify a string to search for in all the repos available. Possible? How?

thanks
0
can we  run a script automatically when a developer commits a change into GIT
best way to run this script. kindly help.
0
I want to know how to edit a comment in git after commit has been pushed , the exact commit number is available with me, I am using "ubuntu 16.04"   and git version is "GitLab Community Edition 8.14.0"
There are few more users who have done a commit after me on the same project.
I do not want other commit messages to be altered.
0
How can we start email notification in VisualSVN server?
0
I want to maintain the versioning in Api,how to manage it ?
what is goal shall we achieved through managing the version ?
Without maintaining the version,can we not manage the application ?
0
Suppose,In your project lots of developer are working ,each developer has changed their own table ,I want to manage it through versioning.
How to manage it ? which tools should be used to manage it ? what will be best possible approach ?
0
New benefit for Premium Members - Upgrade now!
LVL 10
New benefit for Premium Members - Upgrade now!

Ready to get started with anonymous questions today? It's easy! Learn more.

Hi

if you checked out a folder using svn, call it A. Then you made some modifications to A.

You also checked out the same folder, call this copy B. You made some modifications to B, then checked it in , so that it becomes the latest revision and the working copy.

How can you merge the changes you have in A with what is the latest revision? Notice how the changes in A have never been checked in and are no longer the latest working copy or revision either (because of B)?

i tried
svn merge /path/to/A /path/to/B
Also
svn merge --reinitegrate /path/to/A /path/to/B

thanks
0
Hi Experts,

I've only just started using GitHub - via the latest version of Github Desktop (Windows GUI).

I created a repository via the web interface - and added files to it via the web interface.

Now I'm trying to Sync using the Sync button in Github Desktop.

This gives this error:  GitHub Error: "Failed To Sync This Branch. you might need to open a shell and debug the state of this repo.

I've opened the Github shell and typed git status.

Here's the output:

D:\GitHub test [master ? +1 ~0 -0 !]> git status
On branch master
Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        APSDS50/

nothing added to commit but untracked files present (use "git add" to track)
D:\GitHub test [master ? +1 ~0 -0 !]>

Open in new window


That's all goobledegook to me.

I was hoping to fix this by Github Desktop commands - I really don't want to use the Shell if I can avoid it.

Regards,
Leigh
0
The credential Microsoft informing , paid on the computer. How to find out whom did this ?

credencial microsoft
0
Hello All,

Can any one tell me how to call jenkin parameter value into the groovy script

I'm creating a jenkins job that give permission to a another job to a particular User.

below pic shows the parameter. i want to call this parameter value into the groovy script

zdSYE.png
Find the script below.


        import hudson.model.AbstractProject
        import hudson.model.Item
        import hudson.security.AuthorizationMatrixProperty
        import hudson.security.Permission

        AbstractProject proj = hudson.model.Hudson.instance.getItem("testjob")
        AuthorizationMatrixProperty authProperty = proj.getProperty(AuthorizationMatrixProperty.class)
        Set<String> users = new HashSet<>();
        users.add('userid')
        Map<Permission,Set<String>> newPermissions = new HashMap<Permission, Set<String>>()
        newPermissions.put(Item.READ, users)

        proj.addProperty(new AuthorizationMatrixProperty(newPermissions))
        proj.save()



That parameter value should have to come here [ ->('userid')<-here in the groovy script]

can any one tell me how to call jenkin parameter value into the groovy script

Thanks in advance
0
I have a jenkins installation which works fine before I cloned a second instance. I wanted to make a second instance so that I can test upgrade. I successfully made the second instance and upgraded it. However, after upgraded the second instance, my first instance doesn't work properly, I cannot use service command to stop or start the instance. Also, it keeps asking for the passphrase.

Anyone can help me with it?

thanks.

root@monitor:/usr/lib/jenkins_jasontest$ service jenkins stop
Shutting down Jenkins                                      [  OK  ]
root@monitor:/usr/lib/jenkins_jasontest$ service jenkins start
Starting Jenkins                                           [  OK  ]
root@monitor:/usr/lib/jenkins_jasontest$ ps -ef | grep jenkins
root     16586 26783  0 22:20 pts/0    00:00:00 grep jenkins
root@monitor:/usr/lib/jenkins_jasontest$ /etc/alternatives/java -Dcom.sun.akuma.Daemon=daemonized -Djava.awt.headless=true -Duser.timezone=America/Los_Angeles -DJENKINS_HOME=/var/lib/jenkins -jar /usr/lib/jenkins/jenkins.war --logfile=/var/log/jenkins/jenkins.log --webroot=/var/cache/jenkins/war --daemon --httpPort=8080 --ajp13Port=8009 --debug=5 --handlerCountMax=100 --handlerCountMaxIdle=20
Enter passphrase for key '/tmp/ssh373296399860644886key': Enter passphrase for key '/tmp/ssh6335524674191295479key':
Enter passphrase for key '/tmp/ssh6598053261465521274key':
Enter passphrase for key '/tmp/ssh7898039575812345853key':
Enter passphrase for key …
0
I have MyBatis 3.3.1, Spring 4.2.5 and Hibernate 5.0.6.Final.
In application-context.xml :
<bean id="jtaTxManager" class="org.springframework.transaction.jta.JtaTransactionManager">
...
</bean>
<tx:annotation-driven transaction-manager="jtaTxManager" proxy-target-class="false"/>
 <bean id="sessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
        <property name="configLocation" value="classpath:/META-INF/myBatis-config.xml" />  
        <property name="dataSource" ref="dataSource" />
    </bean>

    <bean id="mySessionTemplate" class="org.mybatis.spring.SqlSessionTemplate" autowire="no">
        <constructor-arg index="0" ref="sessionFactory" />
    </bean>
<bean id="myDao" abstract="true" class="...GenericDaoJdbc">
        <property name="sqlSessionTemplate" ref="mySessionTemplate"/>
    </bean>

All this is working fine. Entities specifiefd in myBatis-config.xml annotated with @Entity & @Table (from hibernate 5.0.6)
I tried to implement Hibernate Envers :

<bean id="enversSessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">        
        <property name="dataSource" ref="dataSource/>
        <property name="jtaTransactionManager" ref="jtaTxManager"/>
        <property name="hibernateProperties">
            <props>
                <prop key="hibernate.dialect">org.hibernate.dialect.MySQL5Dialect</prop>
                <prop key="hibernate.show_sql">true</prop>
                <prop …
0
I have a website that I need to commit system generated files and folders to an existing git repository via linux command line. I've pulled the repo to my server, and am writing files within a sub folder of the repo, but when I run 'git add [FOLDER]/*' , its giving me an error that the folder is outside the repository. I'm at a loss as to how to get past this. I'm brand new to git, please help!
0
This is Chef cookbook question.

Question: I need to dynamically reference an index.html file located on github.com within the recipe.

Apache2:

template '/var/www/html/index.html' do
   source index.html.erb
end

In the above code, /var/www/html/index.html file is being replaced with index.html.erb located in <cookbook>/template/default/index.html.erb file. What I want is instead of index.html.erb, I need to use https://github.com/<repository>/myIndex.html

If there is any change in myIndex.html, it should reflect in /var/www/html/index.html realtime.

I appreciate your help.
0
Hi Expert,

I just got installed Git on my server  running on CentOS 6.7. However, I can't access to my repository via public key, actually my laptop can access my server using ssh key which I already added to server, I would like to know is there any configuration I should take on my linux server in order to get access to my repository?

Thanks
0
Free Tool: SSL Checker
LVL 10
Free Tool: SSL Checker

Scans your site and returns information about your SSL implementation and certificate. Helpful for debugging and validating your SSL configuration.

One of a set of tools we are providing to everyone as a way of saying thank you for being a part of the community.

I am using VSS 6

I  am working on 4 files.

I have to modify these  4 files for bug fix1

again..

I have to modify  these same 4 files for bug fix2

Now , how do I  version  these files so that I could  find code with fix1 only and  code with fix2 only separately  at a later time ?

( N.B:   I am asking this because, sometimes user ask  to deploy code to production  with fix2 only excluding fix1 work or vice versa)
0
I have been given to manage team of a startup IT company.
I want to know is there any open source web based tool mainly php if possible for project management
Requirement
1> To Upload the recent programming script on multiple servers(Live servers) as teams are scattered and they upload script without committing and later have no clue for the responsible person.
2> Revert to previous version of code using git or svn if any error is encountered in uploaded script.

For bug tracking i would be using mantis but if that is included in that it would be great
0
I'm trying to install Gitlab on Centos 6 following the instructions on the Gitlab downloads page and have hit a snag.  Being that yesterday was my first time at a linux command line or on a linux machine at all for that matter is I'm sure the reason for my troubles!  So I entered this command first as is:  
curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.rpm.sh | sudo bash

Open in new window

I got this in the response, "Downloading repository file: [the path of the gitlab repo file here]" and then the response: "done."
I'm in no way sure, but it seems as if I downloaded the package correctly.

Next I tried to run the following command:  
yum install gitlab-ce

Open in new window



The response I got here was (and this is where I'm stuck):

Loaded plugins: fastestmirror, protectbase, refresh-packagekit, security
Setting up Install process
Loading mirror speeds from cached hostfile
* base: centos-mirror.jchost.net
*epel: mirror.vcu.edu
*extras: centos.mirror.constant.com
*updates: centos.mirrors.wvstateu.com
*webtatic-e15: uk.repo.webtatic.com
0 packages excluded due to repository protections
No package gitlab_ce available.
Error: Nothing to do

Open in new window


Again, these are the instructions on the gitlab ce omnibus downloads page for centos 6.  Any insight would be greatly appreciated.  Thanks.
0
Hi:

I am a newbie with Mercurial. I've read some online articles about how to do things but still cannot quite wrap my head around it. So here's what I have done after weeks of struggling:
1. cloned a copy of source code to my local directory and make changes on it.
2. created a branch named "dev02" on this local directory (dir1), and make more changes and commit.
3. locally cloned dev02 to another directory (dir2), and make some more changes and commit.

Now I want to push my code on dir2 back to remote default repository. Can I simply do "hg push -b ."?

p.s.Good news is I'm the sole developer working on this project so no worry of what anybody else could have done to the code.

Thanks.
0
im looking for the .exe sizes for internet explorer 9 and up for x86 and x64 versions

example IE 9 x86 is 757,968 and I think IE 11 is 763,600 and IE 10 is 758,000

thanks
0
How to remove executables from git control and remove files with certain extension?
Remove elf executables.

Fedora Linux.
0

Version Control

Version control, also known as revision control or source control, is the management of changes to documents, computer programs, large web sites, and other collections of information. Changes are usually identified by a number or letter code, termed the "revision number," "revision level," or simply "revision." Version control systems (VCS) most commonly run as stand-alone applications, but revision control is also embedded in various types of software such as word processors and spreadsheets, and in various content management systems. Revision control allows for the ability to revert a document to a previous revision. Git, a widely-used VCS, has its own topic; other popular systems include CVS, Subversion, Team Foundation Server (TFS), Visual SourceSafe (VSS) and Perforce.

Top Experts In
Version Control
<
Monthly
>