Re: How to merge a rename of a folder

2012-10-10 Thread Daniel Shahaf
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

Re: Merge bringing in much more than the specified changes

2012-10-10 Thread Stefan Sperling
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 RPMF

Re: How to merge a rename of a folder

2012-10-10 Thread Stefan Sperling
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

Merge bringing in much more than the specified changes

2012-10-10 Thread Kris Deugau
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

Re: accessing my repository from another computer

2012-10-10 Thread Thorsten Schöning
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 cours

Re: accessing my repository from another computer

2012-10-10 Thread Lorenz
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 co

accessing my repository from another computer

2012-10-10 Thread Carmit Shiran
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 reposito

Re: problem with dialog box uisng Tortoisesvn

2012-10-10 Thread Daniel Shahaf
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 svn

Re: problem with dialog box uisng Tortoisesvn

2012-10-10 Thread Carmit Shiran
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 wrote: > Carmit Shiran wrote on Wed, Sep 12, 2012 at 13:12:52 +0200: > > If you look

RE: Help needed: 'History scheduled with commit'

2012-10-10 Thread Bert Huijben
> -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?