When I commit changes with Emacs' built-in VCS interface (I use it with Bazaar) it commits only one file - that's open in current buffer.
So when I press C-c v v, enter message and C-c C-c, it does something like
bzr commit -m "my message" file/open/in.buffer
instead of
bzr commit -m "my message"
How to commit all changes with Emacs?
I keep searching, but cannot find a clear and simple explanation on how to include one XCode project, along with all of it's sub-classes into another project. I routinely see stuff like that in sample projects that I download off the web, but do not know how to do this myself.
Within XCode, along with .h and .m files, and folders, there's a whole new project, starting with a blue xcode project icon, that is expandable to contain everything within the project.
Please, can someone explain to me step by step what do I need to do to add one XCode project into another one? I've seen a ton of one liners like "header search paths", but that does not tell me much.
UPDATE: After re-reading the documentation, I realized that the project to include must be dragged ONTO the BLUE project icon of the parent project. Regular sources can be dragged anywhere, but a project must be dragged onto a project.
Thank you!
I first want to say I've read the Subversion manual. I've read this question. I've also read this question. Here's my dilemma.
Let's say I have 3 repositories laid out like this:
DataAccessObject/
branches/
tags/
trunk/
DataAccessObject/
DataAccessObjectTests/
PlanObject/
branches/
tags/
trunk/
PlanObject/
PlanObjectTests/
WinFormsPlanViewer/
branches/
tags/
trunk/
WinFormsPlanViewer/
The PlanObject and DataAccessObject repositories contain shared projects. They are used by the WinFormsPlanViewer, but also by several other projects in several other repositories.
Bear with me here. I put an svn:externals definition on the WinFormsPlanViewer/trunk folder like this:
https://server/svn/PlanObject/trunk Objects
https://server/svn/DataAccessObject/trunk Objects
And here's what I see after I do an svn update.
WinFormsPlanViewer/
branches/
tags/
trunk/
WinFormsPlanViewer/
Objects/
DataAccessObject/
DataAccessObjectTests/
The PlanObject stuff doesn't even come down in the update! I don't know if this has anything to do with it, but there's an externals definition on the PlanObject/trunk folder also:
https://server/svn/DataAccessObject/trunk Objects
What's going on here? What am I doing wrong? Are there bad consequences of referencing the PlanObject and the DataAccessObject from the WinFormsPlanViewer using svn:externals when the PlanObject references the DataAccessObject using svn:externals also?
It seems that I accidentally checked in my "gen" folder from an Android project (this folder contains the R.java generated class). When I realized I did this I deleted it from SVN and tried to ignore it.
Now I am now getting the error...
"Could not add gen to the ignore list!
Working copy 'C:\code\guru' locked.
When I try to run a cleanup command I get this...
Cleanup failed to process the
following paths:
-C:\code\guru 'C:\code\guru\gen' is not a working copy directory.
When I try to run a resolve I get this...
Working copy 'C:\code\guru' locked
Please execute the 'Cleanup' command.
We are currently on SVN 1.6 on the server.
We have three developers and one tester all working against the same database. We change the schema of the database quite often, and every time we do it tends to have a ripple effect of headaches for everyone else.
Are there good practices in place for .NET oriented development against MS SQL Server 2008 for managing this? I am thinking something similar to Rails Migrations and each dev and tester has their own local database. Or is that overkill? It'd at least be nice to have separate test and dev databases, but currently manually keeping two databases in sync is probably worse than our current predicament.
LiquiBase seems promising, has anyone successfully used it in a similar environment? Or are there better approaches?
We are using SQL Server 2008, VS 2008 and .NET 3.5 if that matters at all.
I want to run scheduled nightly exports of my database code into my SVN source.
It's easy to schedule automated check-in's into svn from a folder, but scheduling the export from SQL in SQL Management Studio is
Right click target database, choose Tasks Generate Scripts.
Follow the wizard and presto you've got scripts in a folder.
Is it possible to extract a single script that the wizard generates, and stuff that into a stored proc which I can run nightly?
Ideas?
A lot of people like git (in particular this guy) against other SCMs such as SVN, but many projects, even new ones, are set up using alternative SCMs. Furthermore, Google Code still does not support it (although many of their large open source projects use it).
My question is: what are the reasons for not using git in any project, whether it be personal or collaborative? Maybe I've just been brainwashed by this guy, but I can't see any area in which other SCMs excel over git.
I'm using Netbeans to develop with Drupal. I'm trying to let Netbeans get drupal core and modules from the repository on drupal.org to my local working copy. Problem is: I already have a working copy that is not versioned yet.
When I try to checkout a copy from drupal.org, Netbeans asks if I want to create a new project - I don't. How can I turn my local copy into a "checked out" working copy?
I have a problem that is described here: http://stackoverflow.com/questions/2146198/tfs-cannot-set-up-new-build
I use Visual Studio 2008. Unfortunately, the solution provided there, didn't help.
I tried to remove and add again my TFS server - no help. Also, it's not a problem with security policies or lack of proper right, because I can initiate a new build, with the same user through Visual Studio 2005, also installed on my computer.
In addition my colleagues have no problems at all.
If someone else have experienced similar problem - I will appreciate any help !
I need to develop a product catalog (about 4000 products) application, which would be given to clients on CD or DVD. The catalog exists in webpage format using PHP and MySQL.
IMPORTANT: the application is given to clients who maight have old PC, old System. For minimal requirements I would put Windows XP and Internet Explorer 6 (if needed).
I need the following features:
1 search option (after productID AND after keyword)
2 print option (by selecting multiple products)
3 shopping cart (making a list which will be sent to an email address if there is any Internet Connection on the computer)
When I was asked to do it I had 2 days to realise a very basic version, so I took the whole website and exported it in HTML pages, and developed an application in C# which contains an embeded browser. So the whole website is now static and put on a CD. Everything fine so far. Now here are the problems:
1. the search option was realized by parsing the html files and reading the productID or looking for keywords inside of them. Put on a CD it was extremely slow (searching in 600MB of html files). FOR THIS I WOULD NEED A SOLUTION WITH A STATIC DATABASE (USING ACCESS OR SOMETHING) TO HAVE INDEXED ROWS, SO THE SEARCH COULD BE A VERY FAST ONE.
2. the printing option was a simply call of the embeded Internet Explorer print functions. Here are two problems:
a) user needs IE7 for printing the website scaled (FIT TO PAGE), otherwise the edges of the page are cut down.
b) users of this app does not have even the basic PC usage skills, so they can't set the printing settings, so there will appear in header and footer the page numbers and titles. QUESTION: can I set these settings from CSS for printing?
3. couldn't make a a shopping cart as I don't use a database, so I have static websites and content is inside the HTML.
QUESTION: WHICH ARE THE BEST SOLUTIONS FOR THE PROBLEMS DESCRIBED ABOVE?
PLEASE ANSWER EVEN IF YOUR ANSWER IS FOR ONE QUESTION ONLY. THANKS
For a while now I've been using subversion for my personal projects.
More and more I keep hearing great things about Git and Mercurial, and DVCS in general.
I'd like to give the whole DVCS thing a whirl, but I'm not too familiar with either option.
What are some of the differences between Mercurial and Git?
Note that I'm not trying to find out which one is "best" or even which one I should start with. I'm mainly looking for key areas where they are similar and where they are different, because I am interested to know how they differ in terms of implementation and philosophy.
I am looking for tips for someone who has done a migration before.
Also, any kind of benchmark about the migration will be very appreciated! (ex. how much time takes the migration tool to migrate a 1 gb data?)
Thanks in advance!
I'm just getting started with Mercurial, and I've come across something which I don't understand.
I made changes to several files, and now I want to undo all the changes I made to one of them (i.e. go back to my last commit for one specific file).
As far as I can see, the command I want is revert.
In the page I linked to, there is the following statement:
This operation however does not change
the parent revision of the working
directory (or revisions in case of an
uncommitted merge). To undo an
uncomitted merge, you can use "hg
update -C -r." which will reset the
parents to the first parent.
I don't understand the difference between the two (hg revert vs. hg update -C -r). Can anyone enlighten me as to the difference? And in my case, do I really want the revert or the update to go get rid of the changes I made to the file?
Thanks
hi,
I did a stupid thing and branched my project on my local disk instead of doing it on the TFS. So now I have two projects on my disk: the old one which has TFS bindings and the new, which doesn't. I want to merge those changes back into the TFS project. How would I go about doing that? I can't do Compare because my local branch has no TFS bindings. There should be some way to compare the differences between the two projects locally and then meld the differences into the old project and check-in, but I can't find an easy way of doing that. Any other solutions?
I've setup a git repository one a remote server. Now I'm trying to checkout from it with:
git fetch ssh://[email protected]/~username/workfolder/
but I get an error:
fatal: Not a git repository
What am I doing wrong? Could it be the server does not support Git+SSH?
Please note this is not a question about online/hosted SVN services.
I am working on a home based, solo developer, project that now has commercial significance and it is time to think about remote source code backup. There is no need for file level check in/out, all I need is once a day or once a week directory level snapshot to remote storage. Automatic encryption would be a bonus to protect my IP.
What I have in mind is some sort of GUI interface app that will squirt a source code snapshot off to an Amazon S3 bucket on an automatic schedule.
(My development PC runs on MS Windows.)
We use Visual Source Safe 6.0 at work and VB6 is supposed to integrate smoothly with Source Safe. Both applications are installed on my PC, but VB6 is not showing the options to integrate with Source Safe (e.g. checking out a file, seeing if a file is shared, etc.).
What do I need to do to get VB6 to integrate with Source Safe 6.0?
I have a list of modifications when I run git status, but I cannot stage them or commit them. How can I fix this?
This occurred after pulling the kernelmode directory from a bare repository somewhere in one huge commit.
% git status
# On branch master
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: kernelmode/linux-2.6.33/Documentation/IO-mapping.txt
# ...
$ git add .
$ git status
# On branch master
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: kernelmode/linux-2.6.33/Documentation/IO-mapping.txt
# ...
I cloned the master and started doing he my work . Due to permissions I push the branch to my fork . I then sent a pull request to my master and someone with permission does the merge .
I notice that Github.com creates a merge commit snapshot which to me looks like just a diff of the entire changes which is actually not necessary but helpful in the sense I can just look at merge commit to see the entire diff . I can see the same sha has as my own branch - hence it looks like the merge is an extra commit which probably aint nexeccary since its a fast forward ?
master - a
myfork(computer) - a->b->c
myfork(github) - a->b->c
Pull request myfork - master (which it says I can automatically merge) shows the entire diff and then when I merge it , it shows up as
master - a->b->c-d . The d is a merge commit which I think it not really required because it is a fast forward ? Can someone explain why does this happen ? I think this is the same scenario if I rebase master if master had gone ahead , but that has not happened . Master is still at when I merge .
We are having havoc with our project at work, because our VCS is doing some awful merging when we move information across files.
The scenario is thus:
You have lots of files that, say, contain information about terms from a dictionary, so you have a file for each letter of the alphabet.
Users entering terms blindly follow the dictionary order, so they will put an entry like "kick the bucket" under B if that is where the dictionary happened to list it (or it might have been listed under both B, bucket and K, kick).
Later, other users move the terms to their correct files. Lots of work is being done on the dictionary terms all the time.
e.g. User A may have taken the B file and elaborated on the "kick the bucket" entry. User B took the B and K files, and moved the "kick the bucket" entry to the K file. Whichever order they end up getting committed in, the VCS will probably lose entries and not "figure out" that an entry has been moved.
(These entries are later automatically converted to an SQL database. But they are kept in a "human friendly" form for working on them, with lots of comments, examples etc. So it is not acceptable to say "make your users enter SQL directly".)
It is so bad that we have taken to almost manually merging these kinds of files now, because we can't trust our VCS. :(
So what is the solution? I would love to hear that there is a VCS that could cope with this. Or a better merge algorithm? Or otherwise, maybe someone can suggest a better workflow or file arrangement to try and avoid this problem?
Title says it. What's the best tool for viewing and editing a merge in Git? I'd like to get a 3-way merge view, with "mine", "theirs" and "output" in separate panels.
Also, instructions for invoking said tool would be great. (I still haven't figure out how to start kdiff3 in such a way that it doesn't give me an error)
edit: My OS is Ubuntu.
I have the oddest problem (but aren't all programming problems odd?). I have a winform that contains a webbrowser object that opens a website that has flash on it. This winform is running on a touchscreen computer (I can't find the brand or model number).
Here is what I know:
flash objects embeded in a website that is accessed via the webbrowser object in my winform do not function properly
said flash objects only react to the first 'click' on them. So the website opens and if I hit a button, that button works but nothing afterward works within the flash object works. If my first 'click' misses a button, nothing works there after.
trying to 'click' an flash button gives the same response as just hovering over the button
This isn't a problem with the touch part of the touch screen as using a mouse also gives the same not working right response
this isn't a problem with the web page as I can open up explorer on the same computer and navigate the webpage just fine from there
The program also works 100% right on my personal computer so it shouldn't be the program's fault
if it's not the touch screen fault and not the program's fault, I can't blame anything right now.
the EXACT same program worked 100% on our old touch screen (which was having other problems so we had to get rid of it).
Oh, also, surfing just a 'normal' webpage in a webbrowser in the winform works just fine.
i'm looking for a good webui tool for mercurial. i've found this link Mercurial with WebUI but what i'm looking for is something that has the ability to do check-in and check-out per file like the PVCS.
any suggestions?
thanks
Edit: Here's the link for PVCS. http://en.wikipedia.org/wiki/PVCS
It's been around 4 years since I last used PVCS and a lot has probably changed but here's as far as I remember. It has a web application wherein a developer can check out a single file. If this file is checked-out, it will be locked to this developer and no other developer can check it out. Then can download the source but they won't be able to check it in unless the original developer (that checked-out the file) checks it in.