I have a trunk (A) and two branches (B and C). When I merge A with C its OK, after I merge A with B, the previous C its overwriten and my trunk don't have the C changes. What I want is A + B + C into trunk after merges. Edited for more explanation: In trunk I have 3 files: "FILE 1", "FILE 2" and "FILE 3"; I create a branch from trunk...
I've tried and tried, but I can't make this less ugly/more ruby-like. It seems like there just must be a better way. Help me learn. class Df attr_accessor :thresh attr_reader :dfo def initialize @dfo = [] @df = '/opt/TWWfsw/bin/gdf' case RUBY_PLATFORM when /hpux/i @fstyp = 'vxfs' wh...
Say you take over some code that exists in different versions, no sourcecontrol (possibly some backups). Are there some tools that let you analyze relationships (more than diffs), or let you reconstruct history in sourcecontrol? If you load it into Subversion, can you do better that to designate the best version as base-version, and th...
The SVN book describes deltification as "each time a new version of a file is committed to the repository, Subversion encodes the previous version (actually, several previous versions) as a delta against the new version." This collab.net blog article says that "In BDB (Berkeley Database) fulltexts are found at the tips of each distinct...
Hi, I wanted to have a simple solution to squash two merge commits together during an interactive rebase. My repository looks like: X --- Y --------- M1 -------- M2 (my-feature) / / / / / / a --- b --- c --- d --- e --- f (stable) That is, I have a my-feature branch that has ...
I'd like to keep Git repositories on four machines synchronized, and all of them are private repos. Is it possible to set up a single Git repository to pull from the other three machines at the same time, with all the changes attempting to merge with a single branch locally? ...
Hi, all. I'm not new to the Branch/Merge idea, but I'm new to CVS. I have a sample file that I have brached off of the main trunk, and have made non-conflicting edits to both the branch and the main. When I go to Merge, however, the process leaves me with all of my changes in a file representing the latest revision of the Main trunk. ...
Hi there! I have an excel 2007 worksheet open with 5 colums and +/-5000 rows of data. What I want to do is create a macro that will: insert 3 blank rows under each record copy the value in that row on column 1 and paste it in the 3 new rows in column 1 CUT the value from column 3 and place it in the first blank row beneath it in colu...
I understand how to merge branches together in git, and I love how easy it makes it. I have a branch that looks like this: project/ |--subproj1/ | |---(files) | |--subproj2/ |---(files) A colleague has a branch that's made significant changes to both subprojects. More specifically, he's altered them both to depend on a common bit...
I've read in various FAQs that git doesn't explicitly track renames/moves, preferring to look for identical (or in some situations similar?) files. That's great, but will it cope with this situation: a friend's remote repository has a new feature (i18n) involving some new files at debian/po/*.po. I have my own fork of this project, and w...
I've been asked to apply conditional sorting to a data set and I'm trying to figure out how to achieve this via LINQ. In this particular domain, purchase orders can be marked as primary or secondary. The exact mechanism used to determine primary/secondary status is rather complex and not germane to the problem at hand. Consider the d...
Hi community, I have a product which comes in two versions, and up to now I was able to manage the differences between them only using compiler flags and #ifdefs. Now I want to have a separate icon for each of the product. The rest of the codebase, including source referencing the icon file remains the same. I want to keep these develop...
Hi, i'm just testing git to find out if i could use it for my work. I ran into a problem that seems small but could become a real one with the real code. My file looks like: text.txt 1 2 3 4 I've a local branch "branch1" and commited changes in both branch and master. In master i changed the first line in the branch the s...
Hi, I have a set of data similar to this: No Start Time End Time CallType Info 1 13:14:37.236 13:14:53.700 Ping1 RTT(Avr):160ms 2 13:14:58.955 13:15:29.984 Ping2 RTT(Avr):40ms 3 13:19:12.754 13:19:14.757 Ping3_1 RTT(Avr):620ms 3 13:19:12.754 Ping3_2 RTT(Avr):210ms 4 13:14:58.955 13:15:29.984 Ping4 RTT(Avr):360ms 5 13:19:1...
I think, this can be programming question. I need free merge tool, in order to compare differences in 2 directories. I used Beyond Compare and Araxis Merge, but this tools are not free. Maybe you can recommend some other? I tried WinMerge, but it is not comfortable to use. ...
using svn 1.6.6 with tortoisesvn 1.6.6 what I am doing: 1) Apply external properties to a folder in the trunk (both single file and folder external, externals are binary files) 2) Create a branch from the trunk and update the entire project 3) Modify a file on the branch and commit the changes, then update the entire project. 4) Mer...
Does anyone know of an Open Source three-way merge implementation in JavaScript or PHP? I want to merge plain text files without the need to rely on any server side binaries. I found a few solutions for creating diffs, but no merge implementations. ...
I frequently need to compare SQL procedures to determine what has changed in the newest version. The problem is, everyone has their own style of formatting, and SQL doesn't (usually) care about where one puts their newlines (e.g. where clauses all on one line vs. newline before each AND). This makes it very difficult (especially for lo...
When a text conflict occurs in Bazaar (and many other dvcs) a .BASE, .THIS and .OTHER file is produced. Its then up to the user to make use of an 3 way merge tool to merge the conflict and then mark it as resolved. I would like to get hold of all the registered merge viewers in eclipse and give the user an option to merge the conflict w...
I have two masks that I would like to merge together, overwriting mask1 with mask2 unless mask2 has a zero. The masks are not binary, they are some value that is user defined in the region of interest and 0 elsewhere. For example if: mask1=[0 5 5;0 5 5]; mask2=[4 4 0;4 4 0]; then I would want an output of [4 4 5;4 4 5]. And if I then...