Search Results

Search found 11 results on 1 pages for 'mergeinfo'.

Page 1/1 | 1 

• How do you get subversion diff summary to ignore mergeinfo properties?

  - by tolomea

  I have subversion 1.6.5 client and 1.5.4 server. And I mostly only care about diffs on fully repository paths, not working copies. When diffing branches ones that have been merged already show up as identical except for the mergeinfo properties. This is a touch annoying for a human who has to then look through the changes looking for anything…

  Read the article

• Subversion - Retrieval of mergeinfo unsupported

  - by jamesthomson

  Hi, I've recently updated my Subversion package on Debian Etch to 1.5.1 via a back-port. I've gone through what I believe are all the appropriate steps but cannot for the life of me get past the following error message when I try to merge: Retrieval of mergeinfo unsupported by '.' The '.' isn't important as I get the same message…

  Read the article

• Remove unnecessary svn:mergeinfo properties

  - by LeonZandman

  When I merge stuff in my repository Subversion wants to add/change a lot of svn:mergeinfo properties to files that are totally unrelated to the things that I want to merge. Questions about this behaviour have been asked before here on Stackoverflow.com, as you can read here and here. From what I understand from the topics mentioned above…

  Read the article

• Svn: revert file content changes without reverting any related mergeinfo?

  - by George Hawkins

  If you've done a merge you may find, before committing the changes, that actually you don't want to accept any of the changes merged into one of the affected files. So you do e.g.: $ svn revert foo.c However this also seems to revert the mergeinfo related to this file. So when you do a subsequent merge it will merge in exactly the same…

  Read the article

• Tortoisesvn using svn:mergeinfo, is there a way to turn it off?

  - by Brian R. Bondy

  When I'm doing a tortoise svn merge, it includes a bunch of directories, and some files into the modified files, even know there are no actual changes. It changes the property svn:mergeinfo Is there any reason why these properties set on the directory/files are needed? Is there any way to get around not doing these changes to…

  Read the article

• SVN supports historical merges so how is Mercurial better?

  - by radman

  Hi, I'm a long time SVN user and have been hearing a lot of brou ha ha with regard to mercurial and decentralised version control systems in general. The main touted feature that I am aware of is that merging in Mercurial is much easier because it records information for each merge so each successive merge is aware of the…

  Read the article

• Where happens merging in SVN - on the client or server?

  - by Malcolm Frexner

  At my company we evaluate working with feature branches. We want to use mergeinfo to track merging. I have issues in some of our tested projects where merging a trunk that has only little changes into branch leads to lots of changed files because of the changed mergeinfo. I read that this behaviour improoved between…

  Read the article

• Detecting branch reintegration or merge in pre-commit script

  - by Shawn Chin

  Within a pre-commit script, is it possible (and if so, how) to identify commits stemming from an svn merge? svnlook changed ... shows files that have changed, but does not differentiate between merges and manual edits. Ideally, I would also like to differentiate between a standard merge and a merge --reintegrate. …

  Read the article

• SVN tool to rebase a branch in git style

  - by timmow

  Are there any tools available that will let me rebase in git style an SVN branch onto a new parent? So, in the following situation, I create a feature branch, and there are commits to the trunk E---F---G Feature / A---B---C---D--H--I trunk I'm looking for a tool which copies the trunk,…

  Read the article

• installing SVN - CentOS - cannot find -lexpat

  - by furnace

  Hey guys, I'm trying to install SVN on CentOS 5. Unfortunately a simple yum install isn't going to work (afaik) because I'm using the DirectAdmin control panel. When it comes to running 'make' I get this error: /usr/bin/ld: cannot find -lexpat I'm new to installing things without yum (!) so am a bit lost. Do you…

  Read the article

• Compile subversion on CentOs

  - by peter

  I have downloaded, compiled and installed so far: apr-1.3.9 apr-util-1.3.9 sqlite-3.6.23 zlib-1.2.4 libtool-2.2.6b Now after downloading subversion-1.6.9, the config works fine but compiling it will end with the following error: cd subversion/svn && /bin/sh /root/subversion-1.6.9/libtool --tag=CC --silent…

  Read the article

1