I am mentoring the programming group of a high school robotics team. I would like to set up a source control repository to avoid the mess of manually copying directories for sharing/backups and merging these by hand. The build location will not usually have network access, so this has led me to distributed version control systems (DVCS), which I am not familiar with.
The largest requirements are the following:
Works in Windows XP and Vista. (absolute must)
Changes can be committed locally.
I was overseeing branching and merging throughout the last release at my company, and a number of times had to modify our Subversion pre-commit hooks to enforce different requirements on check-in comments and such. I was a bit nervous every time I was editing those files, because (a) they're part of a live production system, albeit only used internally (and we're not a huge organization), and (b) they're not under version control themselves.
I'm curious what sort of fail-safes people have in pl
We're using TFS and we're having problems when we switch branches, it's throwing up problems with the TFS bindings every single time.
We still have
which is I'm guessing where it stores the bindings, does anyone have any advice on how to easily switch between branches in TFS without pain?
After reading Storing Images in DB - Yea or Nay? I think that the file system is the right place for storing images. But I would like to know how you handle backup/version control of uploaded images in your different environments (dev/stage/prod) and for network load balancing?
These problems is pretty easy to handle when working with a database e.g. to make a backup from the production environment and restore the DB in the development environment.
What do you think of using for example git to
Many times I'm making two different changes to files in my repository, I want those changes to be treated as two consecutive commits.
For example, in repository
While fixing a bug prog.c and prog.h, I fixed a typo in README.txt. Now I want to commit the change to prog.c with its own commit message, and the change to README.txt afterwards.
In git, I could easily do that with the index
git add prog.c prog.h
git commit -m 'bug #1234'
git commit README.txt -m 'some ty
I am wondering if there is local version control/snapshots for emacs independent of VC?
let me clarify:
every time I save buffer, I would like to be able to keep track of changes of each save in session. I know I can do something similar with backup files, but they are not automated like VC and a somewhat cumbersome.
I have searched Google, but did not find the solution.
Perhaps my query string was not good.
I found this for eclipse, am looking for emacs equivalent:
I have been given the task to team mange a total refactoring of a webpage, build in PHP.
I'm only the student worker :( so my experience in a team development environment is limited.
Well my question here is how do we best manage the development of the website?
At the moment do we use a SVN for version control, where each dev have a branch.
I am having a dream about mapping [brach name].devserver.com to the given branch of the SVN.
But I’m not sure this is the best way to do it? Would setting
What's the difference between:
git add .
git commit -a
Should I be doing both, or is that redundant?
I've recently discovered the collapse extension and I love it. I can work and commit often, and when I'm done with my work I can collapse revisions into one logical changeset. One big changeset instead of many small ones makes the history a lot cleaner.
Sometimes I lose track of which revisions I can collapse (you should never collapse a revision that isn't local). Are there any tools to help me track which revisions came from a pull or a different repo? This would also help with rebase.
I am using following command to get a brief history of the CVS repository.
cvs -d :pserver:*User*:*Password*@*Repo* rlog -N -d "*StartDate* < *EndDate*" *Module*
This works just fine except for one small problem. It lists all tags created on each file in that repository. I want the tag info, but I only want the tags that are created in the date range specified. How do I change this command to do that.
There are two competing requirements
1) I want to pretty print so that I can read and understand code written by my peers
2) I don't want to check in the pretty printed code to source control because...
It might not meet the coding standard where I work
When reviewing history in source control, formatting changes obscure the 'real' changes.
For discussion of problems checking in formatting changes, see this other stackoverflow question
Committing when changing source formatting?
I work as a repo manager for an organization with large teams of developers. Despite our communication efforts, standards definition and awarness raising, we still get developers modifying their configspecs while developing, instead of simply doing a findmerge to retrieve latest developments.
How do you usually deal with such issues? Is there a way to prevent users (coders) from modifying the configspec, once the view is created?
(Not sure if this is the best SE, but nothing else seemed close enough)
I'm a 'fresh' PhD Researcher, and after chatting with most of my cluster-colleagues (including staff), I suggested putting together a system for sharing 'acquired experiential knowledge' (Digital Communications within Electrical Engineering, so lots of code, lots of languages, and lots of algorithms, therefore a lot of things to 'work out' twice.)
Any time that I've done major coding projects, it's been a single repository
Hi i have configured the basics of cruise control to make releases, and automated nunit test using just MSBuild. Now i'm wondering if is possible to deploy/versioning databases with this?
I'm a beginner at CCNet .So if is possible some suggestions or tutorials (if there are) . Also if someone knows a free tool for database deployment/versioning let me know.. i will be grateful.
Thanks in advance
I edited a file and then shelved the changes in it with shelved changelist X. Now I edit another file. How can I add this file in already existing shelved changelist X or generate a new changelist containing changes in both files?
Our team has been using Mercurial for a while now and everything has been great. We all have a clone of the repositories and push/pull named branches to a centralized Windows server which is on our LAN accessed through a mapped drive.
The problem is that I've recently started working remotely and performance has degraded significantly. I connect to the office over VPN and access the shared drive just as I always have but what used to be 20-30 seconds pushes are now taking over 10 minutes!
I generally shelve my Perforce change lists the following way:
Right click the pending changelist.
Click on Shelve.
Unshelve later by right clicking the shelved changelist and click Unshelve.
But not for some reason, I do not see these options in the UI.
So, I shelved my Changelist from the command line using
p4 shelve -c 'change number'
This worked for me, but the problem is that in the P4 GUI, it still shows as a pending changelist and not as a shelved one.
How do i fix this and get
We are running nightly builds on a Jenkins server and we use ClearCase as a Source Control Management.
Since ClearCase is file-centric, files checkin operate one by one. Contrary to SVN or Git (which are repository-centric), modifications by developers are not committed atomically.
This is not problematic during the night, because developers are not active anymore and the ClearCase server has a lock at 1 AM.
But here is an example of what could be a cause of concern when developers are active
Assume the following scenario. Lets say you have a file called foo.bar. It has a main branch and a release branch (lets call it r1). r1 has not yet been released, but the developer needs to work on a new project based off of r1. So we branch r2 off of r1. r1 finishes and needs to merge to main to be released. Can you merge r1 to main before finishing/merging r2 (do all children branches need to be merged into the parent, before the parent merges to main)? Our current policies do not allow us to
I'm working on a .NET project versioned on TFS.
I'm using 2 different computer: pc#1 and pc#2.
The problem I'm getting is with "latest version" of the repository.
working on pc#1
repository at version 10 (i.e., the latest changeset)
need of rollback some files: checkout of specific version (version 8 checked out)
edited a subset of files (e.g., f1, f2, f3)
checkedin the modified version (changeset 11):
f1, f2 and f3 correctly checkedin
f4, f5 asked for conflict merge (thes
I'm looking for ideas as alternatives in TFVC to using the SourceGear Vault Share feature. At the moment I have 2 sets of shared code libraries that I use for multiple solutions - an older (messier) set which compiles to .NET 3.5 and a newer cleaner set which compiles to .NET 4. The 2 sets use different root namespaces but have a number of classes in common which I currently implement by sharing them in Vault. I do want to keep the code in sync in both places - I don't want to branch or copy
A file was added accidentally to a Mercurial repository. How can I untrack it so that it is not included in the next commit? I'd also be interested to know how to accomplish the same task in git.
I have a file I need to move that's already under perforce. Once moved it needs some editing - update the package, etc - appropriate to its new location. Should I submit the move changespec and then reopen it for edit, or can I do this in one go? If so, what is the appropriate sequence of events?
I am a novice in the world of source/version control and I have been doing as much reading as physically possible to get my head around the different techniques that people use for their own source/version control.
One thing that I have noticed is a pretty distinct break in the methods of developers into two (possibly more?) groups: one group prefers to keep their trunk in an always-stable state and performs all maintenance and future development in the branches, while others prefer to do all o
What's the generally used system? Is there a general system, or do all SCM's just set incremting numbers?
I'm looking at migrating a large suite of IBM Assembler Language programs, from a vcs based on "filenames include version numbers", to a modern vcs which will give me, among other things, the ability to branch and merge.
These files have 80-column records, the last 8 columns being an almost-meaningless sequence number.
For a number of reasons which I don't really want to waste space by going into, I need the vcs to ignore (but hopefully preserve in some well-defined manner) the sequence numb
I am working on the developement of a application that will perform online backup of the files and folder in the PC, automatically or manually. Currently, I was keeping only the latest version of the file at the server.Now, I have to implement the versioning so that only the changes can be transfered to the online server and user must be able to download any of the available version of the file at Backup Server.
I need to perform Deduplication for this. Guys, though I am able to perform it usin
This morning, I read two opinions on refactoring.
Opinion 1 (Page not present)
Opinion 2 (Page not present)
They recommend branching (and subsequently merging) code to:
Keep the trunk clean.
Allow a developer to walk away from risky changes.
In my experience (particularly with Borland's StarTeam), merging is a non-trival operation. And for that reason, I branch only when I must (i.e. when I want to freeze a release candidate).
In theory, branching makes sense, but the mechanics of mergi
In the software world, it seems that SCM is an unfortunately overloaded acronym.
It can mean:-
Source Code Management
Software Configuration Management
Which one of these is the dominant term? Do they mean the same thing?
To me Source Code Management is essentially synonymous with Version Control. Whereas Software Configuration Management is a larger subject, which potentially includes Build and Release Management as well.
However looking on Wikipedia, it lists Subversion as a Software C
In the answer to this question, Ry4an states that "you cannot push Changeset2 without pushing Changeset1".
This certainly makes sense if the repository looks like this:
However it doesn't seem to make as much sense in the following scenario, which is what I currently have:
| + Changeset1
Ideally, I want to be able to push just Changeset2 back to the repository I initially cloned from. Mercurial doesn't seem will
I'm part of a team newly using mercurial and we've identified that when merges occur there are many more errors in files that are manually merged. Is it possible from the mercurial logs (i.e. after someone has done the merge and pushed the merge changeset to the central repository) to detect which files were manually merged?
I am trying a lot and i am not bale to get how this version control work in my scenario
I have the VPS server where i host php sites. Users have home directories in /home/users.
Currently users edit files via FTP and i have no control what they do. I want to setup version control system on VPS i don't know hoe to start . I mean
I will explain what i want , i may be wrong but please correct me.
How can i install VCS on my VPS server so that all directories in /home/users are version controll
I have recently joined a small development team that is considering a new version control system. As it is part of a large organisation, we are likely to adopt the company standard of Rational Team Concert.
I have recommended that they should choose something much simpler, but I will probably not get my way.
I have a major concern that it will not play nicely with ReSharper, and will force me to change the way I work. I use ReSharper quite heavily to perform refactoring and have it create and
currently I am maintaining a django web application and I am using rsync via ssh to sync between my files and edits, using www-data user.
Then I reload the apache server.
I have tried git but had many problems on pushing, initiating a bare git couldn't help either.
Apart from deleted files from the source, rsync does it's job quite good.
What do you use?
Using OS: Ubuntu 10.04 LTS x64 on both server and local
we will be doing a project for our Object Oriented Software Eng. class, and our team consists 4 people, including myself. Our groups were made random, so I do not know their level of skills. Maybe they have never heard of version control. I am looking for a system that will allow us to work together. I have used SVN and Git for a very little time. However, I am not very confident with them. Can you suggest a nice and easy to use system that is compatible with Eclipse or NetBeans IDE? Simplicity
Lay of the land (simplified):
I own repo/project Fuzzy. Fuzzy depends on a different project, Zazzy (let's say its a library of some sorts). Both are mercurial repositories. The directory tree would look along the lines of:
-+- Fuzzy /* root repo */
+- Zazzy /* that other repo */
Now, let's say some poor soul decided to checkout my Fuzzy project. He or she will not automatically checkout Zazzy.
How can I mak
Can I do the following without having to learn any version control systems?
branch a codebase (to install an addon on each branch)
merge files (merge--or rather--replace stock files with edited files if provided)
merge files from different branches (so I can cherry-pick a combination of working addons)
I'm a user of osCommerce e-commerce CMS. And it has an addon system which are patches for the stock codebase to increase functionality and features.
The addons site hosts packages which gener
I have inherited maintainence responsibilty for C# solution that is currently under source control in Perforce. I want to port the code to Team Foundation Server. Is there a painless way to do this, or is it a case of manually getting the head from Perforce and adding it to TFS?
(it might be useful to say that I know nothing about Perforce and not much about TFS :-)
I'm currently using Perforce with P4V (Rev. Perforce Visual Client/MACOSX105X86_64/2012.1/490402) in Unity 3.5.5,
When you revert files marked for add, it only removes it from the changelist. Sometimes files are auto generated or I created some files that I don't want to add anymore and I want to remove them from the changelist and delete the local copy of it.
This also occurs when shelving files marked for add. I'm currently manually reverting and deleting each file. Is there a way to easily
I have a codebase on a remote Linux server (in my private home directory). I am traveling and my internet connection is spotty, so I'd like to download the code locally, work on it, and then push changes to the server. Since I'm already managing the codebase with Bazaar, seems like that's the logical tool to use for this task as well. I downloaded Bazaar for Windows, and tried creating a branch, but can't figure out what location to enter in the "From" field. My first guess was to do it the way
I'm looking for a command that will output a list of sequential patches that would apply cleanly if the repository was in a specific known earlier state. Here's an hg glog of a repository that contains some issues I've run into (also available from https://bitbucket.org/dusty/funny_repo/ if you want to play with it your own clone):
@ changeset: 8:ffd749c92f3b
| tag: tip
| summary: h
o changeset: 7:bc959885f6aa
|\ parent: 6:dfe021fa52a4
| | parent: 5:4d8bc738
In TFS2010, one can checkin on behalf of another user (assuming he has permission to do so):
> tf.exe checkin (...) /author:OtherUser
Checkin history shows OtherUser as the user who made the checkin:
> tf history (...) /noprompt
Changeset User Date Comment
--------- ----------------- ---------- -----------
1234 OtherUser (...)
I found a blog post saying "Both your user name and OtherUser are recorded in the changeset data, so that you can always determ
Could you please explain why such approach is not already existing and not widely in use?
Or if such a toolset exists, can you cite it?
Why is it that version control systems (VCS) are working on files (clearcase, svn, git e tc)? and not on units/functions?
So to track changes in a functionality one have to analyze versions of file (sometimes several files) -- as an example: if I want to analyze "Change functionality" I would get a history of that module/function and see it in one place.
Is there any command in Git, that clear the screen. for example in window command line after execute a lot of code, if you type cls, then it will clear all the previous code. so i want the same type of functionality in Git. so can anybody will tell me the command name.
What are "Feature Toggles" and "Feature Branches" and what's the difference between them?
What are the pros and cons? Why is one better than the other?
I found some articles on Google regarding this, and I tend to be in the "Feature Toggles" camp, but I'm not convinced that "Feature Toggles" is the better choice in all the cases.
I am new to Perforce and find it really hard to follow its workflow..
I have used Mercurial before (not in any advanced ways), but what I lack most in Perforce is the idea of named branches.
Let me explain what I'd like to do:
I get the latest revisions of all files and want to work on a new feature/story/task..
I create a brach, say "Feature 3021"
I code, save changes in this branch (hg commit)
I can save changes to a central server (hg push)
When I'm done coding, I merge the changes from
I have a mercurial repository which contains a monolith project I am trying to gradually split. While doing those, I figured I would convert the new sub projects to git hence the one way sync.
A few more details about what I am doing:
the hg repo and the new git repos are located in a private bitbucket cloud account.
I want to keep the commits history while doing the split
All our development is Windows based (although I'm open to do the migration using a unix based system)
the initial repo
In the absence of development branches (or sometimes in the overabundance thereof), it is common to have at least half a dozen of other people's shelves unshelved in a workspace, as well as multiple of one's own: both local changes (divided by directory, of course) and shelves from other workspaces.
(As an aside, yes, this is almost as bad as pre-version control email/tarball/fileshare-based nonsense, and no, there's nothing I can do about it.)
As a result of this situation, it is often necess
Using kubectl get with -o yaml on a resouce , I see that every resource is versioned:
I wonder what is the significance of these versioning and for what purpose these are used? ( use cases )
I have file Filename1.c added to version control. I renamed it to Filename2.c.
Now I need to add another file with the name of Filename1.c to source control under same parent folder.
I am facing a twin error while adding new file with both names (Filename1.c and Filename2.c).
1 2 3 4 5 6
... 下一页 最后一页
共 15 页