Search Results

Search found 4989 results on 200 pages for 'svn merge'.

Page 82/200 | < Previous Page | 78 79 80 81 82 83 84 85 86 87 88 89  | Next Page >

• get file path from svn diff file with PHP and C

  - by coderex

  hi i have a file having svn diff i wish to extract the filenames form the diff. How to write the parser for that.. Index: libs/constant.php =================================================================== --- libs/constant.php (revision 1243) +++ libs/constant.php (revision 1244) @@ -26,5 +26,5 @@ // changesss - +// test 2 ?> \ No newline at end of file Index: libs/Tools.php =================================================================== --- libs/Tools.php (revision 1243) +++ libs/Tools.php (revision 1244) @@ -34,5 +34,5 @@ // another file an change - +// test ?> \ No newline at end of file Sample output. libs/constant.php libs/Tools.php How to write parser in PHP and C.

  Read the article

• ASP.NET, Visual Studio and Subversion - how to integrate?

  - by Michael Stum

  I use AnkhSVN and Visual Studio 2005 and 2008. Now, one thing that bugs me is that Ankh does not really work with ASP.NET sites. I cannot add them properly to a repository and it won't detect changes, especially because the site is on a remote server accessed through Frontpage Extensions (File = Open Site). What are the alternatives? Does a better plug-in exist? Manually downloading the files through FTP and using TortoiseSVN or svn.exe is not really the level of integration I want :) I want to stay within the Visual Studio IDE when possible. Also, I do not control the remote Server, so I can not install anything on it, which means the whole change tracking/comparison to repository has to be done on my machine.

  Read the article

• Git: Make one branch exactly like another

  - by G. Martin

  I am relatively new to Git, and I'm still not very comfortable with it. Right now, I'm looking for the command/options/magic that can make the current branch look like another branch; that is, to merge them, but when a conflict arises, to always choose the difference in the branch that is being merged into the current one. My situation is thus; I have an stable(ish) application on the "master" branch. I also have another branch, called "feature". I basically want to make changes/additions/deletions to feature until I like the new feature I'm working on. Once I feel it is ready, I want to make the master branch look identical to the feature branch. I know this probably isn't a best practice, but as I said, I'm new to Git. I plan on learning how to do more complicated things in the future, but for now, this is all I need. Thanks, SO!

  Read the article

• Merging Brach into Trunk...

  - by jimbo

  Now I know this has been asked a few times, but i'm still not getting it... I use Versions which is doing a great job, I am also using beansalk and they are working nicely together. However, I have been working on a branch of the trunk (sandbox) which I now want to merge back into the trunk. Versions can't do this, so it's into Terminal. Sandbox is reversion 256 and the Trunk (because of a few other amends) is 255. Any help on this would be great, and read a few bits, but still a little lost...

  Read the article

• Why is checking in files called a 'commit'?

  - by Kjetil Klaussen

  The act of checking in files in a source control repository like git, mercurial or svn, is called a commit. Does anyone know the reason behind calling it a commit instead of just check in? English is not my mother tongue, so it might be some linguistic I don't quite get her, but what I'm I actually commiting to? (Hopefully I'm not commiting a crime, but you'll never know.) Is it in the meaning of "to consign for preservation"? Is it related to transactions (commit at the end of a transaction)?

  Read the article

• In a pre-commit hook - how to access/compare current and previous versions of files

  - by EthanML

  I'm trying to add to our existing pre-commit SVN hook so that it will check for and block an increase in file size for files in specific directory/s. I've written a python script to compare two file sizes, which takes two files as arguments and uses sys.exit(0) or (1) to return the result, this part seems to work fine. My problem is in calling the python script from the batch file, how to reference the newly committed and previous versions of each file? The existing code is new to me and a mess of %REPOS%, %TXN%s etc and I'm not sure how to go about using them. Is there a simple, standard way of doing this? It also already contains code to loop through the changed files using svnlook changed, so that part shouldn't be an issue. Thanks very much

  Read the article

• How to export changed files in dependency project when create updates? (TortoiseSVN + VisualSVN)

  - by Relax

  I have a project with it depends on another project Core, i use svn:external to maintain the dependency. when i go to create an update of my project, i export those changed files of two tags of my project, but the changed files in Core won't be exported. For example, my project 2.0 depends on Core 1.0, where 3.0 depends on Core 2.0, then i create an update, changed files of my project 3.0 will all be exported, but none of those in Core 2.0 This can be done thru a two-steps process, first export changed files of the project 3.0, then the Core 2.0, it is ok if i can remember it everytime when i create an update, but in case i forget someday, the broken update will most probably cause a crash. I wonder, is there a way to cover this situation in TortoiseSVN, will let me do it in one operation?

  Read the article

• When using source control, what files should actually be commited?

  - by SimpleCoder

  I am working on a small project, hosted on Google Code, using SVN for source control. This is my first time using source control, and I'm a bit confused about what I should actually be committing to the repository. My project is very simple: A Class Library project, written in C#. The actual code that I have written is a single file. My question is this: Should I be committing the entire project (including directories like Debug, Release, Properties, etc.) or just my main .cs file? Thanks, After fighting with Subversion for a while (note to self: do not reset repository), it looks like I finally have it working with the directories laid out properly. Thanks again for all your advice.

  Read the article

• Java, merging two arrays evenly

  - by user2435044

  What would be the best way to merge two arrays of different lengths together so they are evenly distributed in the new array? Say I have the following arrays String[] array1 = new String[7]; String[] array2 = new String[2]; String[] mergedArray = new String[array1.length + array2.length]; I would want mergedArray to have the following elements array1 array1 array1 array2 array1 array1 array1 array2 array1 but if I were to change the size of the arrays to String[] array1 = new String[5]; String[] array2 = new String[3]; String[] mergedArray = new String[array1.length + array2.length]; then I would want it to be array1 array2 array1 array2 array1 array2 array1 array1 basically if it can be helped each array2 element shouldn't be touching each other; exception if array2 has a size larger than array1.

  Read the article

• Displaying only the similarities between 20 or so files?

  - by leeand00

  Say I've got a directory full of html pages. Their headers and footers are basically the same, but I want to be able to see only the portions of all the pages that are the same. I'd like to call it an n-way merge, but that isn't what it is, it's looking for just the similarities between the header and the footers of all the files. (and my header I don't mean just the <head> tag, but rather the portions of the page that are alike). Note: There are like 20 html files. Is there a name for a tool that does this?

  Read the article

• Multiple repositories or single repository with branches?

  - by Goro

  I have been working on a project for some time, and it has branched off into several different versions. All versions have some common code base, and each version has specific functionality that is unique, and each version will need to be supported individually. What SVN structure would you recommend? Right now I am using a separate repository for each project, but the downside of that is that it is impractical for large number of products. The downside of using a single repository with branches is that it would add revision numbers to every branch whether anything was committed, regardless from which branch. What setup do you/would you use in this situation?

  Read the article

• How to syncronize merge subscription in Sql Compact DB (on a Mobile device emulator)

  - by Bero

  Using SQL ManagementStudio 2008 I created SQL 3.5 Compact DB (TestCompact.sdf) and I have created subscription to existing Publication. Using SQL Management Studio it is working. I have transfered TestCompact.sdf to Windows Mobile 5 emulator device and with QueryAnalyzer for Mobile I could query existing tables in TestCompact.sdf. I don't know how to start replication synchronization on that mobile device. Do I need to write some C# code or it is possible do it more simple?

  Read the article

• Looking for WebAii Framework free edition online - before the Telerik merge

  - by jdk

  Art of Test produced a nice UI testing tool for free -- WebAii Framework-- that I've been using to add client-side DOM unit tests to my projects. Recently they merged with Telerik and it's now a commercial product. From free to $1500 is suddenly very expensive. Does anybody know if the community edition is still available, or even the last free version is available for download? At least I can finish off with that.

  Read the article

• Json object merge with unqiue id

  - by Hitu

  I have multiple json Objects json1 = [ {'category_id':1,'name':'test1' }, {'category_id':1,'name':'test2' }, {'category_id':1,'name':'test3' }, {'category_id':2,'name':'test2' }, {'category_id':3,'name':'test1' } ]; json2 = [{'category_id':1,'type':'test1'}]; json3 = [ {'category_id':1,'color':'black'}, {'category_id':2,'color':'black'}, {'category_id':3,'color':'white'} ]; I am expecting output like this final = [ {'category_id':1,'name':'test1','type':'test`','color':'black' }, {'category_id':1,'name':'test2','type':'test`','color':'black' }, {'category_id':1,'name':'test3','type':'test`','color':'black' }, {'category_id':2,'name':'test2','color':'black' }, {'category_id':3,'name':'test1','color':'white' } ]; As i have long json object. Looping is good idea or not ? Does there is any inbuilt function for doing the same.

  Read the article

• Version control PHP Web Project

  - by Adam Lerman

  We have a php project that we would like to version control. Right now there are three of us working on a "Dev" version of the project that all have our Eclipse linked to it with just an external folder, and thus no version control. What is the right way, and what is the best way, to version control this (not necessarily the same I dont think) We have a SVN set up but just need to find a good way to check in and check out that lets us test on the dev server. Any ideas?

  Read the article

• is there a limit of merge tables with Mysql ?

  - by sysko

  I'm working on a database with mysql 5.0 for an open source project it's used to stored sentences in specific languages and their translations in other languages I used to have a big table "sentences" and "sentences_translations" (use to join sentences to sentences) table but has we have now near one million entries, this begin to be a bit slow, moreover, most of request are made using a "where lang =" so I've decided to create a table by language sentences_LANGUAGECODE and sentences_translation_LANGSOURCE_LANGTARGET and to create merge table like this sentences_ENG_OTHERS which merge sentences_ENG_ARA sentences_ENG_DEU etc... when we want to have the translations in all languages of an english sentence sentences_OTHERS_ENG when we want to have only the english translations of some sentences I've created a script to create all these tables (they're around 31 languages so more than 60 merge table), I've tested, that works really great a request which use to take 160ms now take only 30 :) but I discover that all my merge table after the 15th use to have "NULL" as type of storage engine instead of MRG_MYISAM, and if delete one, then I can create an others, using FLUSH table between each creation also allow me to create more merge tables so is this a limitation from mysql ? can we override it ? thanks for your answers

  Read the article

• Mercurial and particular files branching

  - by zerkms

  The context: i have a project, that contains configs/ directory, which contains (surprise-surprise!) a set of config files: database.php, facebook.php, twitter.php, cache.php, etc What I did in svn: I have created branches per specific file and made changes there (changed database connections, facebook API keys, etc). So they were stored in my private branch. Now I'm trying to migrate to "modern" nowadays DSCM - Mercurial. And I cannot get any possibility of doing the same. Any ideas?

  Read the article

• Easiest way to merge two List<T>s

  - by Chris McCall

  I've got two List<Name>s: public class Name { public string NameText {get;set;} public Gender Gender { get; set; } } public class Gender { public decimal MaleFrequency { get; set; } public decimal MaleCumulativeFrequency { get; set; } public decimal FemaleCumulativeFrequency { get; set; } public decimal FemaleFrequency { get; set; } } If the NameText property matches, I'd like to take the FemaleFrequency and FemaleCumulativeFrequency from the list of female Names and the MaleFrequency and MaleCumulativeFrequency values from the list of male Names and create one list of Names with all four properties populated. What's the easiest way to go about this in C# using .Net 3.5?

  Read the article

• What are these folders for? Can I remove them? How?

  - by Water Cooler v2

  In a folder on the SVN server/repository that is designated for our project, there have appeared the following folders: branches/ conf/ db/ hooks/ locks/ tags/ trunk/ README.txt (file) format (file) We have all the code in the trunk folder. There were, as far as I can remember, only 3 or 4 folders earlier. Within the trunk folder, too, there are now these folders. OurCode/ conf/ db/ hooks/ locks/ README.txt (file) format (file) I understand many of these folders or files are not necessary, but I can't be too sure. My questions are: 1) What are each of these files and/or folders for? 2) Which are the ones that are not necessary? 3) How may I remove them from the server repository?

  Read the article

• How can i merge arrays like a gearwheel

  - by JuKe

  i have 3 arrays like this $a = array( 0 => 'a1', 1 => 'a2', 2 => 'a3' ); $b = array( 0 => 'b1', 1 => 'b2', 2 => 'b3' ); $c = array( 0 => 'c1', 1 => 'c2', 2 => 'c3' ); and i like to have somethink like this: $r = array( 0 => 'a1', 1 => 'b1', 2 => 'c1', 3 => 'a2', 4 => 'b2', 5 => 'c2', 6 => 'a3', .... ... ); how can i do this, with the opinion of more than 3 arrays EDIT: i have tried this: $a = array( 0 => 'a1', 1 => 'a2', 2 => 'a3', 3 => 'a4' ); $b = array( 0 => 'b1', 1 => 'b2', 2 => 'b3' ); $c = array( 0 => 'c1', 1 => 'c2', 2 => 'c3', 3 => 'c3', 4 => 'c3', 5 => 'c3' ); $l['a'] = count($a); $l['b'] = count($b); $l['c'] = count($c); arsort($l); $largest = key($l); $result = array(); foreach ($$largest as $key => $value) { $result[] = $a[$key]; if(array_key_exists($key, $b)) $result[] = $b[$key]; if(array_key_exists($key, $c)) $result[] = $c[$key]; } print_r($result); this work.. but the code isn't nice. so anyone has a better solution?

  Read the article

• how to merge two ordered list of objects?

  - by bhavna raghuvanshi

  public class ListMerge { public static void main( String[] args) { Scanner input = new Scanner(System.in); System.out.println ("Input length of arraylist 1:"); int n = input.nextInt(); ArrayList x = new ArrayList(); ArrayList y = new ArrayList(); for (int i = 0; i < n; i++) { System.out.println ("Input x[ " + i +"] :" ); x.add(new Integer(i)); } System.out.println ("Input length of arraylist 2:"); int m = input.nextInt(); for (int i = 0; i < m; i++) { System.out.println ("Input y[ " + i +"] :" ); y.add(new Integer(i)); } List<Integer> all = new ArrayList<Integer>(); all.addAll(x); all.addAll(y); System.out.println(all); } } I did this but its not taking values from user. pls tell me why....

  Read the article

• Commiting broken code to the repository for the purpose of backing it up

  - by Tim Merrifield

  I was just talking to another developer (more senior than I) and trying to convince him that we should implement continuous integration via Cruise Control. He told me that this will not work because he commits code that does not compile to the repository all the time for the purposes of backing it up. And that automated builds notifying us of failures would be just noise. Committing garbage to the repo sounds bad to me. But I was at a loss of words and didn't know what to say. What is the alternative? What's the best practice for backing up your code on another machine without adding a bunch of pointless revisions? BTW, our version control system is SVN and that probably won't change any time soon.

  Read the article

• visual tool to resolve conflicts merged into a single file

  - by Yehosef

  I did a git merge and ended up with a file like that looks like this: class member extends item{ /********CONSTANTS**********/ const is_flaggable = true; const is_commentable = false; const is_ratable = false; const table = 'member'; <<<<<<< HEAD const table_about = 'mem_about' ; const table_to_about = 'mem_to_about' ; const table_hobbies = 'mem_to_hobby'; ======= const table_friendship = 'friendship'; const table_about = 'mem_about' ; const table_to_about = 'mem_to_about' ; const table_hobbies = 'mem_to_hobby'; const table_friendship_id = 3; >>>>>>> my-copy In this file there are many blocks like this. Is there a visual tool to help me look at this file and pick and choose the changes I want? Most of the diff tools I found are for looking at two files.

  Read the article

• Merge Twitter Outh and Facebook Connect Friends

  - by G Ullman

  Basically what I want to do is download all a users facebook and twitter friends and somehow find a way to figure out which entries represent the same person. I know it's possible because a lot of social search sites like spokeo achieve what I want and more, so does anyone know how they go about doing it or the best way to go about it? I have a basic idea of the facebook and twitter api calls I need to be making however feel free to add any advice or warnings there as well. I know facebook hashes the emails which seems like it could pose a problem. Any help is greatly appreciated.

  Read the article

• Merging XMLTextReaders in C#

  - by smithchelluk

  I have a website that needs to pull information from two diffferent XML data sources. Originally I only need to get the data from one source so I was building a URL in the backend that went and retrieved the data from the XML site and then parsed and rendered it in the front end of the website. Now I have to use a 2nd data source and merge the result sets (which are identically structured XML) into one result set. Here is the code I am currently using to get one XML feed. sUrl = sbUrl.ToString(); //The URL for the XML feed XmlDocument xDoc = new XmlDocument(); StringBuilder oBuilder = new StringBuilder(); //The parsed HTML output XmlTextReader oXmlReader = new XmlTextReader(sUrl); oXmlReader.Read(); xDoc.Load(oXmlReader); XmlNodeList List = xDoc.GetElementsByTagName("result"); foreach (XmlNode node in List) { XmlElement key = (XmlElement)node; //BUILD THE OUTPUT HERE } Thanks in advance for your help.

  Read the article

< Previous Page | 78 79 80 81 82 83 84 85 86 87 88 89  | Next Page >