RE: New to SVN

2011-12-07 Thread Cooke, Mark
> > > On 12/7/2011 8:16 AM, James Lopes wrote: > > > > > > I created a project in our repository and used import to load > > > the source code. Now my working folder has every icon that > > > svn has any ideas? > > You need to provide more details. What were the commands you > > used to crea

Question

2011-12-07 Thread Randall Reynolds
Hi, I created a trunk and branch A from the trunk. Then, I created a file in the trunk. Then, I merged from the trunk to the branch using TortoiseSVN's merge two branches option. The merge encountered a tree conflict on the file. Selecting edit tree conflict says: The last merge operation

Subversion exception report

2011-12-07 Thread Daniel C
Just installed the latest TortoiseSVN, and when I try to check out from subversion, I get the following error: --- Subversion Exception! --- Subversion encountered a serious problem. Please take the time to report this on the Subversion mailing list

Re: Question

2011-12-07 Thread Randall Reynolds
> Hi, > > I created a trunk and branch A from the trunk. Then, I created a file in > the trunk. Then, I merged from the trunk to the branch using TortoiseSVN's > merge two branches option. The merge encountered a tree conflict on the > file. Selecting edit tree conflict says: > The last mer

RE: New to SVN

2011-12-07 Thread James Lopes
From: James Lopes [mailto:jlo...@bostonfinancial.com] Sent: Wednesday, December 07, 2011 12:51 PM To: David Chapman Cc: users@subversion.apache.org Subject: RE: New to SVN From: David Chapman [mailto:dcchap...@acm.org] Sent: Wednesday, December 07, 2011 11:48 AM To: James Lopes Cc: users@subve

Re: New to SVN

2011-12-07 Thread David Chapman
On 12/7/2011 9:51 AM, James Lopes wrote: *From:*David Chapman [mailto:dcchap...@acm.org] *Sent:* Wednesday, December 07, 2011 11:48 AM *To:* James Lopes *Cc:* users@subversion.apache.org *Subject:* Re: New to SVN On 12/7/2011 8:16 AM, James Lopes wrote: I created a project in our repository an

RE: New to SVN

2011-12-07 Thread James Lopes
From: David Chapman [mailto:dcchap...@acm.org] Sent: Wednesday, December 07, 2011 11:48 AM To: James Lopes Cc: users@subversion.apache.org Subject: Re: New to SVN On 12/7/2011 8:16 AM, James Lopes wrote: I created a project in our repository and used import to load the source code. Now my worki

RE: New to SVN

2011-12-07 Thread James Lopes
From: David Chapman [mailto:dcchap...@acm.org] Sent: Wednesday, December 07, 2011 12:15 PM To: James Lopes; users@subversion.apache.org Subject: Re: New to SVN (The convention on this list is not to top-post. Also, please "reply all" so that the entire conversation can be searched in the Subve

Re: New to SVN

2011-12-07 Thread David Chapman
(The convention on this list is not to top-post. Also, please "reply all" so that the entire conversation can be searched in the Subversion archives.) On 12/7/2011 8:56 AM, James Lopes wrote: *From:*David Chapman [mailto:dcchap...@acm.org] *Sent:* Wednesday, December 07, 2011 11:48 AM *To:*

RE: New to SVN

2011-12-07 Thread Cooke, Mark
> -Original Message- > From: David Chapman [mailto:dcchap...@acm.org] > Sent: 07 December 2011 16:48 > To: James Lopes > Cc: users@subversion.apache.org > Subject: Re: New to SVN > > > On 12/7/2011 8:16 AM, James Lopes wrote: > > > > I created a project in our repository and used import

Re: New to SVN

2011-12-07 Thread David Chapman
On 12/7/2011 8:16 AM, James Lopes wrote: I created a project in our repository and used import to load the source code. Now my working folder has every icon that svn has any ideas? You need to provide more details. What were the commands you used to create the repository (if it did not a

New to SVN

2011-12-07 Thread James Lopes
I created a project in our repository and used import to load the source code. Now my working folder has every icon that svn has any ideas? Please consider the environment before printing this email. ---

merge error

2011-12-07 Thread Péter SZABADY
Hi! I chose the "Merge a range of revisions". "Revision range to merge": 210990-210991. Merge depth: "Working copy", and I selected "Compare whitespaces". This error always occurs. --- Subversion Exception! --- Subversion encountered a serious prob

RE: Subversion Exception!

2011-12-07 Thread George Reimer
I found some lingering .svn folders so I think it was due to a partial upgrade of the checkout tree. ( .svn to non.svn ) Resolved by a complete tree checkout. Thanks -Original Message- From: Ulrich Eckhardt [mailto:ulrich.eckha...@dominolaser.com] Sent: Wednesday, December 07, 2011 2:11