3
голосов
1ответов
2671 просмотров

subversion merge - "has different repository root than"

I'm working on a relatively new project using Subversion. I've already branched off a couple of times and merged that branch back to trunk with no problems. However, my latest merge is failing - and it seems to be tied into the fact that I added a new file to the branch that does not yet exist on...

4
голосов
4ответов
6193 просмотров

How to use beyond compare as a external svn diff tool

I want to configure it so that svn diff filename shows the diff in beyond compare. I am on ubuntu. On a related note what is everyone using to diff and merge. BC is awesome on windows, but very ugly looking on Linux, imo.

1
голосов
1ответов
1547 просмотров

git & Cygwin - trailing whitespace causes "not uptodate"

Git on Windows w/ Cygwin is fraught with dangers. However there's one that's really starting to bug me. It's related to the core.autocrlf=true behaviour. After spending a week trawling the 'net it became clear that the problems you'll encounter are less bad with this set. However, if a file has ...

25
голосов
1ответов
12033 просмотров

git merge: keep one side for some files, manual merge the rest

In a merge with conflicts, is there a way to tell git to keep one version for a set of files? $ git checkout some_branch $ git merge origin/master $ ?

4
голосов
3ответов
295 просмотров

What is the preferred merge method for SQL Server 2005?

I have mainly been using the Exists Method for merging a row into a table but I am considering switching to the Row Count Method. Is there any reason not to? Exists Method If Exists(Select * From Table Where ID = @ID) Begin Update Table Set Value = @Value Where ID = @ID End Else Begin ...

15
голосов
2ответов
30278 просмотров

Pushing to remote repository after merge "creates new remote heads" - is that bad?

I initialized a Mercurial project on Machine A, committed my changes and uploaded them to a remote repository. Then I cloned that repository on Machine B, committed some additional changes and uploaded them to the same remote repository. In both cases, I uploaded the changes with the same comm...

4
голосов
2ответов
588 просмотров

Is it better to use a separate commit message for a git merge?

I come from an SVN background so I'm not sure what the typical git workflow looks like. When you merge in SVN, you provide a commit message describing the merge. This is necessary because SVN's merge-tracking has historically been poor. I noticed that git's default behavior is to automatically c...

25
голосов
3ответов
29871 просмотров

Algorithm for merging two max heaps?

Is there an efficient algorithm for merging 2 max-heaps that are stored as arrays?

3
голосов
4ответов
497 просмотров

Merge like dates in MS Access

I am a pilot who flies multiple legs in a day. The software I use to log flights spits out a csv file and lists every leg separately. I import the csv file into table 1 in ms access. I would like to merge all flights from the same day into one record on a new table. My problem is combining th...

15
голосов
12ответов
99251 просмотров

How do I Merge two Arrays in VBA?

Given Dim arr1 As Variant Dim arr2 As Variant Dim arr3 As Variant arr1 = Array("A", 1, "B", 2) arr2 = Array("C", 3, "D", 4) What kind of operations can I do on arr1 and arr2 and store result in arr3 such that: arr3 = ("A", "C", 1, 3, "B", "D", 2, 4)

3
голосов
3ответов
178 просмотров

Conflicts when merging into branch some changes in deleted code

We've recently created a branch with a version of code customized for a certain client. We're working on both branches at the same time, commiting 'common' changes into the trunk, then merging them to the branch. Recently, we've come to a troublesome situation. In trunk/bar.c we have (among othe...

4
голосов
3ответов
152 просмотров

how to identify branches that need to get merged in git

I make a lot of bugfix and feature branches and in the end merge them all into a release candidate (rc). but when i test the rc I am not sure if i have merged in all the branches. How can I find out which branches are missing? I tried gitk, but it seems it shows only the branches that are alread...

1428
голосов
76ответов
1199806 просмотров

How to merge two arrays in JavaScript and de-duplicate items

I have two JavaScript arrays: var array1 = ["Vijendra","Singh"]; var array2 = ["Singh", "Shakya"]; I want the output to be: var array3 = ["Vijendra","Singh","Shakya"]; The output array should have repeated words removed. How do I merge two arrays in JavaScript so that I get only the unique...

2
голосов
2ответов
2228 просмотров

Selective merging in subversion

Does anyone know how to avoid merging certain files in a branch merge? For eg., if i am merging stuff from say mybranch to trunk but if i DONT want to try merging certain files, is there a way to set something to ignore looking at these files? The files i need ignore may or may not share file e...

4
голосов
1ответов
2777 просмотров

Reparenting a branch in TFS2008

Say I have branch A in TFS from which I take branch B. Some changesets are made on B, then from B, branch C is taken, and more changes are made on branch C A ------------------------------ | B ----1--2------------------ | C ----3-----4--- Now suppose we ...

20
голосов
1ответов
6522 просмотров

Merge many data frames from csv files, when ID column is implied?

I'd like to merge a bunch of data frames together (because it seems many operations are easier if you're only dealing w/ one, but correct me if I'm wrong). Currently I have one data frame like this: ID, var1, var2 A, 2, 2 B, 4, 5 . . Z, 3, 2 Each ID is on a single row w/ several s...

3
голосов
2ответов
2412 просмотров

How do I "merge forward" in svn?

For instance, suppose I have a branch that I want to update with the new stuff in trunk. I've always just merged trunk into the new branch, but I came across a somewhat different process that Divmod uses. Does divmod have some kind of special requirement to do branching like this, or have I bee...

11
голосов
1ответов
5416 просмотров

How to ignore folder during subversion merge

I have a whole bunch of changes that I need to be merged in to my branch but I want to ignore a specific folder during the merge. Is it possible to do this using Subversion? If so then how can I do it? EDIT: The folder that I want to ignore is in the repository but I don't changes to be made to ...

3
голосов
6ответов
1656 просмотров

What can cause SVN Update to merge incorrectly?

I got an email a few days ago from someone who was having trouble building a Delphi project I have on Google Code. The project file and one of the DFM files were munged after he updated with some changes I had checked in. We talked back and forth a bit, and traced it down to what he said was SV...

18
голосов
2ответов
4296 просмотров

How can 2 Python dictionaries become 1?

Possible Duplicate: Python “extend” for a dictionary I know that Python list can be appended or extended. Is there an easy way to combine two Python dictionaries with unique keys, for instance: basket_one = {'fruit': 'watermelon', 'veggie': 'pumpkin'} basket_two = {'dairy': 'cheese', '...

1
голосов
2ответов
877 просмотров

Merging database structure changes from one server to another

I currently have a website with three builds: development, staging and production. Each of those has it's own MySQL database instance. Each of the instances has different data in it which should not change (orders). My question is, if I made changes to the structure of the development database, ...

4
голосов
4ответов
484 просмотров

Workflow for maintaining different versions of codebase for different versions of Python

I'm developing an open source application called GarlicSim. Up to now I've been developing it only for Python 2.6. It seems not to work on any other version. I decided it's important to produce versions of it that will support other versions of Python. I'm thinking I'll make a version for 2.5, ...

9
голосов
4ответов
3475 просмотров

How to merge Drupal database changes

We currently use an SVN repository to ensure everyone's local environments are kept up-to-date. However, Drupal website development is somewhat trickier in that any custom code you write (for instance, PHP code written for a node body) is stored in the DB and the changes aren't recognized by the ...

0
голосов
1ответов
1679 просмотров

Create PDF from Merge document via ASP C#

Okay, here is what i want to do.. A user will run a query and return 3 pieces of data (really more but for this example lets say 3.. such as name, city, state). The user will then be prompted with a list of 1 or more documents that are basically word merge documents. Does not have to be word ...

1
голосов
1ответов
358 просмотров

Why do I have duplicate rows for the same subscriber in my MSmerge_identity_range table?

I have a database with merge replication set up on a SQL 2005 server with 1 subscriber. I am having some identity range issues an I started to look at the MSmerge_identity_range table. I have one subscriber but 2 rows for each. For Example(I shortend the guids but for arguments sake they are t...

0
голосов
1ответов
453 просмотров

SVN merge files

I'm using TortoiseSVN as my SVN client. How can I know if a file was merged in the past ? Thank you.

19
голосов
4ответов
14074 просмотров

Branching and Merging Strategies

I have been tasked with coming up with a strategy for branching, merging and releasing over the next 6 months. The complication comes from the fact the we will be running multiple projects all with different code changes and different release dates but approximately the same development start da...

3
голосов
2ответов
1141 просмотров

Reading GIT Merge Markers

Sorry, this is a very simple question. What does this merge marker mean in GIT >>>>>>> next-release:db/schema.rb when it's got no accompanying? ======= Also, is there some way to tell GIT to just choose one version over another?

5
голосов
9ответов
4542 просмотров

xml diff in ruby?

What is the best/fastest way to merge two xml documents with ruby? I have two xml files, one that's formatted so it is visually appealing, one that isn't (and it has comments and whitespaces stripped) that has a few changes to some of the nodes throughout, and it gets changed often. So I'm tryi...

3
голосов
2ответов
464 просмотров

Help me understand Svn merge

I don't understand svn merge. Here's the scenario: We have a branch that contains the latest stable copy of our code. I will refer to this branch as 'the branch'. There's also a trunk branch which contains a few new additions, but we don't want to mess with that at this point. We have a vendor ...