RE: Help needed: 'History scheduled with commit'
-Original Message- From: Daniel Shahaf [mailto:d...@daniel.shahaf.name] Sent: woensdag 10 oktober 2012 03:49 To: David Aldrich Cc: 'users@subversion.apache.org' (users@subversion.apache.org) Subject: Re: Help needed: 'History scheduled with commit' That's 1.7, isn't it? Have you tried just committing? If you commit using the cmdline client you'll get a second list of files in the editor window, and even if you don't you can always revert the commit (via reverse merge) or test by committing the merge to a newly-created temporary branch. Committing an copy of a directory includes all the files inside. Before Subversion 1.7 merges would have reported all the files individually added, while it only committed the copy of the parent directory. We fixed this issue when switching to the new working copy backend. The result in the repository will be identical to what it was before 1.7, but status explains better what really happens. And now it can also report 'M +' when the file is scheduled to be added via its parent, but is itself modified. Bert
Re: problem with dialog box uisng Tortoisesvn
Hi all, Does anyone know how can I access my local repository on my computer from a different computer? I installed the TortoiseSVN locally on my computer. Thanks On at, Sep 15, 2012 at 12:23 AM, Daniel Shahaf d...@daniel.shahaf.namewrote: Carmit Shiran wrote on Wed, Sep 12, 2012 at 13:12:52 +0200: If you look at my example I sent in the previous email, you can see I filled in the argument= $target_path : my $target_path = file:///C:/svn_repos3/trunk/Widget3 But I'm looking for a way to fill it automatically with the current path/tag. Is it possible? Have a look at svn:keywords. Something like my $foo = 'EOF'; $URL$ EOF is probably the best readable. And if no one said that already, remember that if you share a repository with other people it's recommended _not_ to use file://.
Re: problem with dialog box uisng Tortoisesvn
Please start a new thread for unrelated problems: http://subversion.apache.org/docs/community-guide/mailing-lists#fresh-post You should probably say a bit more about your situation in order to get a more specific reply. If you just want anonymous unencrypted access, it'll be easiest to set up svnserve --- either tortoise or several of the options in http://subversion.apache.org/packages#windows will wrap that for you. Daniel Carmit Shiran wrote on Wed, Oct 10, 2012 at 12:13:02 +0200: Hi all, Does anyone know how can I access my local repository on my computer from a different computer? I installed the TortoiseSVN locally on my computer. Thanks On at, Sep 15, 2012 at 12:23 AM, Daniel Shahaf d...@daniel.shahaf.namewrote: Carmit Shiran wrote on Wed, Sep 12, 2012 at 13:12:52 +0200: If you look at my example I sent in the previous email, you can see I filled in the argument= $target_path : my $target_path = file:///C:/svn_repos3/trunk/Widget3 But I'm looking for a way to fill it automatically with the current path/tag. Is it possible? Have a look at svn:keywords. Something like my $foo = 'EOF'; $URL$ EOF is probably the best readable. And if no one said that already, remember that if you share a repository with other people it's recommended _not_ to use file://.
accessing my repository from another computer
Hi, I installed TortoiseSVN on my computer and I want to access my files in the repository I created on my local computer, from another computer. Is that possible? Can I just access via a path (e.g/ file://) ? what exactly should I write in the path? How do I specify on what computer is my repository? Do I need a server? It's only me, no other users so I'm trying to avoid using a server (which I'm also not familiar with). I prefer using a path or something simple. thanks a lot in advance!
Re: accessing my repository from another computer
Carmit Shiran wrote: I installed TortoiseSVN on my computer and I want to access my files in the repository I created on my local computer, from another computer. Is that possible? Can I just access via a path (e.g/ file://) ? what exactly should I write in the path? How do I specify on what computer is my repository? Do I need a server? It's only me, no other users so I'm trying to avoid using a server (which I'm also not familiar with). I prefer using a path or something simple. using the file:// protocol is not recommended for other purposes then local testing. setting up svnserve quiet easy: either run it from the command line as required svnserve -d --root path-to-repo and close the command prompt when finished or create a windows service (all in one line) sc create svnserve binpath= \path-to-TSVN-bin-folder\svnserve.exe\ --service --root \path-to-repo\ DisplayName=svnserve depend= Tcpip to run svnserve in the background automatically see also http://svnbook.red-bean.com/nightly/en/svn.serverconfig.html -- Lorenz
Re: accessing my repository from another computer
Guten Tag Carmit Shiran, am Mittwoch, 10. Oktober 2012 um 12:49 schrieben Sie: I installed TortoiseSVN on my computer and I want to access my files in the repository I created on my local computer, from another computer. Which OS are you using on both computers? Is that possible? Of course or do you really think any other user of Subversion only works on private, locally stored repos? ;-) Can I just access via a path (e.g/ file://) ? If you export a share with the parent of the repo, you can use file:// notation, but this is only recommended if you really are the only user. Else the easiest thing is to run svnserve on the computer where your repo is stored. The svn book has the steps needed. what exactly should I write in the path? How do I specify on what computer is my repository? This depends on which access method you choose. Do I need a server? Yes, in any case, but the server is just your computer with the repo stored, of course. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon.030-2 1001-310 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Merge bringing in much more than the specified changes
I've just come across a very strange merge glitch; I don't recall seeing anything like it reported and I'm not sure if I'm just doing something wrong or not. $ svn --version svn, version 1.6.15 (r1038135) (from the RPMForge repo, on CentOS 5) I have a project that is very close to a new stable release, but I've also had a couple of bugs reported that I've fixed in /trunk and I'm backporting to /branches/stable in the meantime. I just tried merging the commits for one of these bugfixes, but I'm getting a lot more code merged than I see from svn diff -c on the relevant revisions. The repository is public at https://secure.deepnet.cx/svn/dnsadmin; I'm trying to merge revisions 417 and 418 from /trunk to /branches/stable. Merging r417 I end up with an extra ~150 new lines in the third fragment - not part of the commit in r417, so far as I can see, and which I'm pretty sure was committed quite a while ago (before ~r330 or so). -kgd
Re: How to merge a rename of a folder
On Tue, Oct 09, 2012 at 09:10:41PM +0200, Martin Bischoff wrote: Thanks a lot for the detailed information. Please see below for some additional questions. Sure. The incoming delete of A conflicts with the local delete of A. This happened because both sides (trunk, and branch) decided to rename A to B, and Subversion cannot yet tell the difference between a normal deletion and a deletion that happens as part of a move (which sucks, and we're trying to fix this, but that's a separate discussion). In this particular case, deleting A is the Will the (hopefully soon-to-be-released) version 1.8 already contain some improvements in that area? Not for incoming moves, no. Maybe for moves which exist as local changes in the working copy. But that helps mostly during updates, not so much during merges. Instead of merging revision N and resolving the conflicts, would a record-only merge of revision N give the same result? Yes, except that record-only merges will update all subtree mergeinfo within the merge target, if any exists. Is the same procedure required when renaming files instead of folders, or does this issue only happen when renaming folders? It happens with files, too, and the workaround should be pretty much the same.
Re: Merge bringing in much more than the specified changes
On Wed, Oct 10, 2012 at 01:04:02PM -0400, Kris Deugau wrote: I've just come across a very strange merge glitch; I don't recall seeing anything like it reported and I'm not sure if I'm just doing something wrong or not. $ svn --version svn, version 1.6.15 (r1038135) (from the RPMForge repo, on CentOS 5) I have a project that is very close to a new stable release, but I've also had a couple of bugs reported that I've fixed in /trunk and I'm backporting to /branches/stable in the meantime. I just tried merging the commits for one of these bugfixes, but I'm getting a lot more code merged than I see from svn diff -c on the relevant revisions. The repository is public at https://secure.deepnet.cx/svn/dnsadmin; I'm trying to merge revisions 417 and 418 from /trunk to /branches/stable. Merging r417 I end up with an extra ~150 new lines in the third fragment - not part of the commit in r417, so far as I can see, and which I'm pretty sure was committed quite a while ago (before ~r330 or so). -kgd This is not a conflict-free merge when I try it (into a working copy of ^/branches/stable@418): $ svn merge -c417 ^/trunk --- Merging r417 into '.': CDNSDB.pm --- Recording mergeinfo for merge of r417 into '.': U . Summary of conflicts: Text conflicts: 1 Conflict discovered in file 'DNSDB.pm'. Select: (p) postpone, (df) diff-full, (e) edit, (m) merge, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p If there is a conflict during a cherry-pick merge, this kind of thing can happen. Please see this post and the replies to it: http://svn.haxx.se/users/archive-2011-10/0821.shtml My own reply which tries to explain the problem is here: http://svn.haxx.se/users/archive-2011-10/0832.shtml The other replies are well worth reading, too.
Re: How to merge a rename of a folder
Stefan Sperling wrote on Wed, Oct 10, 2012 at 22:14:49 +0200: On Tue, Oct 09, 2012 at 09:10:41PM +0200, Martin Bischoff wrote: Instead of merging revision N and resolving the conflicts, would a record-only merge of revision N give the same result? Yes, except that record-only merges will update all subtree mergeinfo within the merge target, if any exists. ... which matters if rN contained changes other than renaming a directory.
