Search Results

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

Page 13/200 | < Previous Page | 9 10 11 12 13 14 15 16 17 18 19 20  | Next Page >

• "svn: Delta source ended unexpectedly" and proxy server

  - by Vladimir Bezugliy

  I cannot checkout working copy if I use proxy server. SVN starting to checkout files but, checkout several files but then stops and shows following error: svn: Delta source ended unexpectedly I can checkout working copy if I work without proxy server. But I constantly have problems if I work via proxy. Is this problem with proxy server or with svn? UPDATED: I tried to access other svn repositories located on different servers via proxy and it seems to me that I have problem only with one svn server. Other svn servers are accessible via proxy server.

  Read the article

• Merge only a one remote branch into a local branch with Mercurial

  - by Pepijn

  I wan to manage some profiles as XML files in Mercurial repos. The setup I'm thinking of: Each user has a repo with a branch where he manages his own profile, and a number of branches where he can pull and merge other profiles from that branch of another user. So for example I have my own profile branch and a branch labeled friends, in which I want to pull the profile branches of a few remote repos, to collect like a collection of profiles. I figured out that since the repos are unrelated I need to use -f, but I can't figure out how to pull and merge only a single branch into another. So I want like me friend someone profile ---> friends <--- profile \-> family friends <--- profile Is this even possible? Should I use separate repos instead? Is there a better solution?

  Read the article

• Electronic Postage provider compatible with Microsoft Word Mail Merge

  - by theguy

  We're looking for an e-postage provider that is capable of working with the Mail Merge function in Microsoft Word 2007. Every now and then we extract addresses from our database to mail letters or notices. We use Mail Merge in Word 2007 to print the address information straight to the envelopes and then run all the envelopes through a Pitney Bowes Postage Meter. It would save us a huge step if we could somehow get an e-postage provider where we can just print out the postage straight to the envelopes along with the addresses at the same time. Anyone know of such a provider or a better solution?

  Read the article

• SVN Checkout URL - fresh install

  - by Webnet

  I just setup SVN on a server that is running Ubuntu server as a fresh install. I've got it up and running but am having difficult determining how to connect to it. I'm trying to do an import using the local IP address: http://IP/RepositoryName but it's saying it can't resolve the IP. I'm wondering if there's something on the server I need to setup. I have not modified dav_svn.conf because there is another server here that is running SVN (I'm migrating it to a new server) and it's dav_svn.conf is not modified. The current working SVN has a subdomain associated with the IP location of the server but doesn't do anything special with the ports as far as I can tell. I'm getting this error via RapidSVN when I try to import... Error: Error while performing action: OPTIONS of 'http://IP/RepositoryName': could not connect to server (http://IP) Any help would be appreciated

  Read the article

• svn diff including annotate/blame-alike information of when changes where made by who

  - by Wouter Coekaerts

  Can you add annotate/blame-alike information to svn diff, so that for every changed line it includes which user and revision changed that line? For example, an annotate-diff comparing revisions 8-10 could output something like: 9 user1 - some line that user1 deleted in revision 9 10 user2 + some line that user2 added in revision 10 The context, lines around it which haven't changed, may be included as well or not, doesn't matter. It's not just a matter of "quickly" writing a shell script combining the output of svn diff and svn annotate. annotate for example will never show you who removed a line. It's also not a matter of doing annotate on a revision in the past: We're not interested in who originally added the line that got removed (that's not the one who "caused" the diff), we want to know who removed it. I suspect the only way to implement something to do this is to inspect each and every commit between the two revisions being compared (and somehow map all the changes in the separate diffs to lines in the total diff)... Does there exist a tool that does something like that?

  Read the article

• Merge table columns in Word 2003 or Word 2010

  - by luvieere

  How can I merge two table columns in Word 2003 or Word 2010?

  Read the article

• Convert svn repository to hg - authentication fails

  - by Kim L

  I'm trying to convert an existing svn repository to a mercurial repo with the following command hg convert <repository> <folder> My problem is that the svn repository's authentication is done with p12 certificates. I'm a bit lost on how to configure the certificate for the hg client so that I can pull the svn repo and convert it. Currently, if I try to run the above command, I get initializing destination hg-client repository abort: error: _ssl.c:480: error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure In other words, it cannot find the required certificate. The question is, how do I configure my hg client so that it can use my certificate? I'm using the command line hg client on linux.

  Read the article

• SVN : how to change hostname?

  - by elon

  I'd like to sep up SVN repo on local machine. But we already have apache running under localhost. When I use instalator form subversion site with apache option it installs another apache and when I type "localhost" in browser I see this new apache (not the old one). Question is how to run this new apache under other host name. When installing it asks about it, so I set different name, but it still works under localhost (nothing happens). I'd like to have access to svn via URL e.g. "svnrepo" not "localhost". What can I do about it? Which lines of config should be changed (and/or what's more should be changed?) Another way I'm thinking of to solve this problem is to integrate this svn-apache module with mine apache. But still I don't really know how to do it (my apache is 2.2.6)

  Read the article

• InDesign CS4+ Data Merge with Remote Images?

  - by Todd F

  Is it possible to use InDesign's data merge to link to remotely hosted images if the full path is known?

  Read the article

• Creating svn repo programmatically from a webpage and sudo

  - by Adriano Varoli Piazza

  We want to automate the creation of the svn repos and trac environments for new projects. Basically, this would mean creating a web script that got some info (like env and repo name, etc) from the user and then executed sudo -u svn svnadmin create /var/svn/<projectname> trac-admin /var/trac/sites/<projectname> initenv [... All extra params...] For the second command, this is simple, as it already runs as the www-data user, so I wouldn't have to use sudo. But for the first command, I'd have to use sudo and add www-data to the sudoers file. I was wondering if this is a good idea, and how to do it in that case. Reading the manpage has left me with more doubts than certainties about this. This webserver would only be accessible from our internal network, by the way. The OS is Ubuntu Server 10.04.

  Read the article

• Subversion: svn protocol with HTTP/HTTPS proxy

  - by Neeraj

  Hi all, I need to do a svn checkout,say svn checkout svn://XYZ.com/trunk. I am using the svn client from behind the proxy. I had accessed other repositries using the http protocol in past but with svn protocol,it fails with "Connection Refused", reason I think being the port not allowed by the proxy.Nonetheless, the HTTP protocol is not supported on the server. However, svn+ssh gets connected but it prompts for an account at that server which I don't have? Is there any way out other than requesting for an account? Note that I can't affect the settings of the proxy server.

  Read the article

• Electronic Postage provider compatible with Microsoft Word Mail Merge

  - by theguy

  We're looking for an e-postage provider that is capable of working with the Mail Merge function in Microsoft Word 2007. Every now and then we extract addresses from our database to mail letters or notices. We use Mail Merge in Word 2007 to print the address information straight to the envelopes and then run all the envelopes through a Pitney Bowes Postage Meter. It would save us a huge step if we could somehow get an e-postage provider where we can just print out the postage straight to the envelopes along with the addresses at the same time. Anyone know of such a provider or a better solution?

  Read the article

• Work with a local copy of the "master" SVN repo

  - by Werner

  Hi, at work, we have a SVN repo, which we access to thorugh http, like: svn co http://user@machine/PATH even at work and for some misterious reasons, teh connections between local machines and the repo machine are very slow, but the connection between home and work is almost impossible. I wonder if I could do somethin like: 1- get a copy of the "master" SVN repo to my local machine 2- each time i make modifications etc, use svn co http://user@MYLOCALmachine/PATH instead of svn co http://user@machine/PATH 3- when I am back at work, "merge" somehow all the modifications in my local repo to the master one. Sorry, I am ewally new to SVN, any hint would be appreciated. Thanks

  Read the article

• Word 2010 & Outlook 2007 - HTML Mail Merge Doesn't Work, Plain Text and Attachments do

  - by Prejay

  Hopefully someone has an answer or fix for this. When using Outlook 2007 & Word 2007 or Word 2010 & Outlook 2010, Mail merging Works fine. However there are some systems that have Word 2010 and Outlook 2007 installed. In these cases, Mail Merging to HTML Emails doesn't do anything. If i choose to Mail Merge to Plain text emails or attachments, these go through Outlook. Only HTML Email doesn't work. Now, something like Mapi Labs Mail Merge toolkit is abole to get around this, but I was wondering if there was any statement/solution on cross version support for HTML Mail Merging from Microsoft.

  Read the article

• Labels mail merge repeats on subsequent pages?

  - by leeand00

  I'm trying to do a mail merge to print to labels. The first field in the document does not contain a { NEXT } field code, and because of this the records repeat between label pages for example: Notice how the records shift to the left as the next page is displayed? But how they start over again in an off by one manner? Now I've tried to fix this by using the first record displayed on a page to see if the page number is 1. If it not on page 1 of the mail merge then it should just move to the next record; otherwise it should just display the first record: This doesn't work however, because when I do the preview and display the {page} field code, it reports that I am always on page 1 and thus the same behavior continues instead of just moving to the next record on the next page.

  Read the article

• Conflict resolution merge commit seems incomplete

  - by kayaker243

  There was a feature branch with conflicts. These were resolved and the resolution committed. Unfortunately, I botched the merge and a couple previously-released features regressed - this is verified by doing a diff between the merge commit sha1 and that of the previous tag. When I do git show <sha1 for merge commit> all changes are innocuous. When I do git log -Sunique_variable_added_for_feature_and_lost_after_botched_merge, I only see the commit that added unique_variable_... but not the problematic deletion from the bad merge. However, when I took the ignominious step of viewing the sha1 for the commit in a gui git client like Tower, I can clearly see the botched lines. Is there an additional switch used by Tower that I've missed entirely? Why didn't pickaxe pick up the deletion implicit in the merge commit?

  Read the article

• Mercurial merge strategy per file type

  - by dls

  All: I want to use kdiff to merge all files with a certain suffix (say *.c, *.h) and I want to do two things (turn off premerge and use internal:other) for all files with another suffix (say *.mdl). The purpose of this is to allow me to employ a type of 'clobber merge' for a specific file type (ie: un-mergable files like configurations, auto-generated C, models, etc..) In my .hgrc I've tried: [merge-tools] kdiff3= clobbermerge=internal:other clobbermerge.premerge = False [merge-patterns] **.c = kdiff3 **.h = kdiff3 **.mdl = clobbermerge but it still triggers kdiff3 for all files. Thoughts? An extension of this would be to perform a 'clobber merge' on a directory - but once the syntax is clear for a file suffix, the dir should be easy.

  Read the article

• How to make SVN ignore a folder?

  - by pg

  I want to make SVN ignore everything that is in my wordpress directory. It bring me nothing but headaches because of auto updates to plugins etc. When I... svn propedit svn:ignore ./blog It tells me... svn: None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and no 'editor-cmd' run-time configuration option was found So I... [phil@sessions www]$ export SVN_EDITOR=emacs [phil@sessions www]$ svn propedit svn:ignore ./blog But I don't know what to put in here to make it ignore.

  Read the article

• Subversion error: Repository moved permanently to please relocate

  - by Bart S.

  I've set up subversion and apache on my server. If I browse to it through my webbrowser it works fine (http://svn.host.com/reposname). However, if I do a checkout on my machine I get the following error: Command: Checkout from http://svn.host.com/reposname, revision HEAD, Fully recursive, Externals included Error: Repository moved permanently to 'http://svn.host.com/reposname/'; please relocate I checked apache's error log, but it doesn't say anything. (it does now - see edit) My repositories are stored under: /var/www/svn/repos/ My website is stored under: /var/www/vhosts/x/... Here's the conf file for the subdomain: <Location /> DAV svn SVNParentPath /var/www/svn/repos/ AuthType Basic AuthName "Authorization Realm" AuthUserFile /var/www/svn/auth/svn.htpasswd Require valid-user </Location> Authentication works fine. Does anyone know what might be causing this? -- Edit So I restarted apache (again) and tried it again and now it give me an error message, but it doesn't really help. Anyone have an idea what it means? [Wed Mar 31 23:41:55 2010] [error] [client my.ip.he.re] Could not fetch resource information. [403, #0] [Wed Mar 31 23:41:55 2010] [error] [client my.ip.he.re] (2)No such file or directory: The URI does not contain the name of a repository. [403, #190001] -- Edit 2 If I do svn info it doesn't give anything usefull: [root@eduro eduro.nl]# svn info http://svn.domain.com/repos/ Username: username Password for 'username': svn: Repository moved permanently to 'http://svn.domain.com/repos/'; please relocate I also tried doing a local checkout (svn checkout file:///var/www/svn/repos/reposname) and that works fine (also adding / commiting works fine). So it seems is has something to do with apache. Some other information: I'm running CentOs 5.3 Plesk 9.3 Subversion, version 1.6.9 (r901367) -- Edit 3 I tried moving the repositories, but it didn't make any difference. selinux is disabled so that isn't it either. -- Edit 4 Really? Nobody :(?

  Read the article

• Making my SVN Public

  - by azz0r

  Hello, I'm looking todo an SVN checkout on a server so I need to make my local SVN public. I looked into GITHUB, but I'm not willing to pay or let the world see my project. Are there any alternates? Okay so I went through this tutorial: http://www.petri.co.il/setup-ssh-server-vista.htm Had some issues, so I did this: mail-archive.com/[email protected]/msg84875.html Now I'm wondering how let the SSH access my SVN repo found in c:/wamp/svnRepo. Any tutorials or advice (please no: go read this book crap) greatly welcome!

  Read the article

• How to secure svn+ssh checkout users?

  - by vvanscherpenseel

  All our SVN repositories are hosted on a dedicated machine on which all the developers have access. Every now and then we need to checkout a repository on a machine we don't own or operate ourselves. Currently we all use our own system (SSH) account for this, but instead I would like to use some generic 'checkoutsvn' user that can be used for this. This user is only used for checking out from a repository, but should not be allowed to log in to the system (no shell access). I tried to do this by setting the default shell of that account to /sbin/nologin but then SVN fails, as apparently svn+ssh requires shell access. How do you do this? Is there a good solution for this?

  Read the article

• Getting some perl script errors on execution of svnnotify

  - by user2474633

  I installed svnnotify:2.84, perl module 5.10 for subversion 1.7.11 on redhat release 6. And i am using this command in post-commit hooks to get notified svnnotify --repos-path "$1" --revision "$2" --from [email protected] \ --to-regex-map [email protected]="branches/Test_branch12" \ --smtp xxxxxx.com HTML::ColorDiff >> /tmp/notify.txt 2>&1 once the commit is successful i can see the below mentioned error in the output file. Use of uninitialized value $[0] in exec at /usr/local/share/perl5/SVN/Notify.pm line 2332. Can't exec "": No such file or directory at /usr/local/share/perl5/SVN/Notify.pm line 2332. Use of uninitialized value $[0] in concatenation (.) or string at /usr/local/share/perl5/SVN/Notify.pm line 2332. Cannot exec : No such file or directory Child process exited: 512 Can anyone help on this.

  Read the article

• svn project with linked common files

  - by Eric

  The src directory of my project is composed by three folders: two sub-projects and some common files. I linked the files of the common directory to the two sub-projects. I've just imported my project to svn but end up with three duplications of the content of the common directory. I'm wondering if svn can deal with this and how. Like an option which specify to not consider links. I thought about deleting in svn linked files from the sub-projects. Thank you, Éric.

  Read the article

• SVN Checkout error on large repositories

  - by Brian Mitchell

  I wonder if anyone can help me. We have recently migrated our Subversion repository from a VisualSVN Server on Windows to a subversion server on CentOS. The migration was succesfull however we are getting the following error message Error REPORT of svn'/svn/MangoRepository/!svn/vcc/default': Could not read chunk size: Error connection was closed by server (http://servername) Now the workaround for this is simply to perform a update on the repo and it will contine where is left off. Im just wondering if anyone was a permanent fix for this as it can be quite frustrating to repeat my self to 60-70 developers.

  Read the article

• Cannot dump svn repository

  - by vinga

  I've a problem with my svn repo. I cannot use it, I even cannot dump it. svnadmin verify repo returns Can't set position pointer in file 'svn/db/revs/0/0' When I try to dump repo (no matter what revision range), console output shows: * Dumped revision 0. svnadmin: Final line in revision file missing space I've googled that this may be connected with wrong version apr apache2 library, but I have other repositories which work good, so I thing this isn't the case. Is there any way to save at least some files from my repo? Can svn repo get corrupted so easily (probably after power-cut, however I'm not sure).

  Read the article

< Previous Page | 9 10 11 12 13 14 15 16 17 18 19 20  | Next Page >