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 create the repository (if it did not already exist) 
> > and what were the commands you used to create the project and 
> > import the initial source code?  Finally, what do you mean by 
> > "every icon"?  Can you give us an example of an unexpected file name?

> Do I have to have my working folder and svn folder have the same name?

> Dave I thought I replied to everyone. The Tortoise ref was 
> from another reply which you didn't get because I didn't reply-to-all.
> 
> Well I found the solution to my problem, or at least my svn 
> is in a better state. I named the project in svn with a 
> different name that the folder used to load my project. After 
> renaming my working folder to the name of the svn folder and 
> deleting some folders in svn that should have been sourced. I 
> performed a Clean on my working folder and everything is working now.

Did you read the [free!] link that I gave you yesterday?  Both the TortoiseSVN 
manual [1] and the online subversion book [2] are pretty much essential reading 
if you want to get the most out of subversion (there is a lot of common 
material in both books but TortoiseSVN is IMO a slightly better reference for a 
windows user).  Read the introduction / fundamental concepts / basic usage 
sections.  Those sections don't take too long to read.

[1] http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/index.html

[2] http://svnbook.red-bean.com/en/1.7/index.html

In general, the root checkout folders do not have to have the same name; this 
allows you to have multiple local working copies if you need/want to work on 
several tasks at the same time.  Sub-folders will be named the same by the 
client when created and if you change any of the folder names the "wrong way" 
you will run into "conflicts"  This is all explained in the subversion book...

~ mark c

P.S. could you (bottom-)post in plain text?


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 tried to delete/move/rename the file 'file'
but the file was deleted, moved, or renamed locally.

This message suggests that a merge operation tried to delete/move/rename a
file, and does not suggest that the merge operation tried to add the file.
Why?

What should I do to make the branch match the trunk, in this case?  How can
I prevent the tree conflict from showing up in the future for this file?

Thanks,

Randall


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
with as much information as possible about what
you were trying to do.
But please first search the mailing list archives for the error message
to avoid reporting the same problem repeatedly.
You can find the mailing list archives at
http://subversion.apache.org/mailing-lists.html
Subversion reported the following
(you can copy the content of this dialog
to the clipboard using Ctrl-C):
In file
 
'D:\Development\SVN\Releases\TortoiseSVN-1.7.2\ext\subversion\subversion\libsvn_client\checkout.c'
 line 94: assertion failed (svn_uri_is_canonical(url, pool))
---
OK
---
I am not on the list, so please address any suggestions to me directly.


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 merge operation tried to delete/move/rename the file 'file'
> but the file was deleted, moved, or renamed locally.
>
> This message suggests that a merge operation tried to delete/move/rename a
> file, and does not suggest that the merge operation tried to add the file.
> Why?
>
> What should I do to make the branch match the trunk, in this case?  How
> can I prevent the tree conflict from showing up in the future for this file?
>
> Thanks,
>
> Randall
>


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@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 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 already exist) and what were the commands you 
used to create the project and import the initial source code?  Finally, what 
do you mean by "every icon"?  Can you give us an example of an unexpected file 
name?

--

David Chapman dcchap...@acm.org

Chapman Consulting -- San Jose, CA



Do I have to have my working folder and svn folder have the same name?


Dave I thought I replied to everyone. The Tortoise ref was from another reply 
which you didn't get because I didn't reply-to-all.
Well I found the solution to my problem, or at least my svn is in a better 
state. I named the project in svn with a different name that the folder used to 
load my project. After renaming my working folder to the name of the svn folder 
and deleting some folders in svn that should have been sourced. I performed a 
Clean on my working folder and everything is working now.



Please consider the environment before printing this email.



IMPORTANT NOTICE. The information contained in this electronic message and any 
attachments to this message are intended for the exclusive use of the 
addressee(s) and may contain confidential or privileged information. If you are 
not the intended recipient, or the employee or agent responsible for delivering 
this message to the intended recipient, you are hereby notified that you 
received this communication in error. Any review, dissemination, distribution 
or copying of this communication is strictly prohibited. If you receive this 
communication in error please send a return e-mail, and then delete this 
message, together with any attachments.




IMPORTANT NOTICE.  The information contained in this electronic message and any 
attachments to this message are intended for the exclusive use of the 
addressee(s) and may contain confidential or privileged information. If you are 
not the intended recipient, or the employee or agent responsible for delivering 
this message to the intended recipient, you are hereby notified that you 
received this communication in error.  Any review, dissemination, distribution 
or copying of this communication is strictly prohibited.  If you receive this 
communication in error please send a return e-mail, and then delete this 
message, together with any attachments.


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 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 already exist) and what were the 
commands you used to create the project and import the initial source 
code?  Finally, what do you mean by "every icon"?  Can you give us an 
example of an unexpected file name?


--
 David chapmandcchap...@acm.org  
 Chapman Consulting -- San Jose, CA
  
Do I have to have my working folder and svn folder have the same name?




The ".svn" folder (for 1.6.x and earlier, folders) is created 
automatically when the working copy is created.  It is managed by 
Subversion and you should not modify anything in it.


--
David Chapman dcchap...@acm.org
Chapman Consulting -- San Jose, CA



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 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 already exist) and what were the commands you 
used to create the project and import the initial source code?  Finally, what 
do you mean by "every icon"?  Can you give us an example of an unexpected file 
name?


--

David Chapman dcchap...@acm.org

Chapman Consulting -- San Jose, CA



Do I have to have my working folder and svn folder have the same name?


Please consider the environment before printing this email.


IMPORTANT NOTICE.  The information contained in this electronic message and any 
attachments to this message are intended for the exclusive use of the 
addressee(s) and may contain confidential or privileged information. If you are 
not the intended recipient, or the employee or agent responsible for delivering 
this message to the intended recipient, you are hereby notified that you 
received this communication in error.  Any review, dissemination, distribution 
or copying of this communication is strictly prohibited.  If you receive this 
communication in error please send a return e-mail, and then delete this 
message, together with any attachments.


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 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: 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 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 already exist) and what were the commands you 
used to create the project and import the initial source code?  Finally, what 
do you mean by "every icon"?  Can you give us an example of an unexpected file 
name?
The repository had already been created I used Tortoise to create the project 
folder, then used it again to import the files to the project. Now some file 
have the red !, green check, no icon at all, a few have the blue ?. I also have 
folders that don't have an .svn subfolder. I can't add, update my changes.

For the most part, this is a TortoiseSVN question and is probably best directed 
to us...@tortoisesvn.tigris.org.  I don't 
use it, so I can't help with TortoiseSVN-specific questions.

If you are using Subversion 1.7.x under TortoiseSVN, the working copy format 
has changed and there will be only one .svn directory at the root of your 
working copy.  Furthermore, if your working copy already existed when the 
Subversion 1.7.x client was installed, it must be upgraded.

Ok thanks do I enter the >>?

--

David Chapman dcchap...@acm.org

Chapman Consulting -- San Jose, CA


Please consider the environment before printing this email.


IMPORTANT NOTICE.  The information contained in this electronic message and any 
attachments to this message are intended for the exclusive use of the 
addressee(s) and may contain confidential or privileged information. If you are 
not the intended recipient, or the employee or agent responsible for delivering 
this message to the intended recipient, you are hereby notified that you 
received this communication in error.  Any review, dissemination, distribution 
or copying of this communication is strictly prohibited.  If you receive this 
communication in error please send a return e-mail, and then delete this 
message, together with any attachments.


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:* 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 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 already exist) and what were the 
commands you used to create the project and import the initial source 
code?  Finally, what do you mean by "every icon"?  Can you give us an 
example of an unexpected file name?


The repository had already been created I used Tortoise to create the 
project folder, then used it again to import the files to the project. 
Now some file have the red !, green check, no icon at all, a few have 
the blue ?. I also have folders that don't have an .svn subfolder. I 
can't add, update my changes.




For the most part, this is a TortoiseSVN question and is probably best 
directed to us...@tortoisesvn.tigris.org.  I don't use it, so I can't 
help with TortoiseSVN-specific questions.


If you are using Subversion 1.7.x under TortoiseSVN, the working copy 
format has changed and there will be only one .svn directory at the root 
of your working copy.  Furthermore, if your working copy already existed 
when the Subversion 1.7.x client was installed, it must be upgraded.


--
David Chapman dcchap...@acm.org
Chapman Consulting -- San Jose, CA



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 
> > 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 already exist) 
> and what were the commands you used to create the project and 
> import the initial source code?  Finally, what do you mean by 
> "every icon"?  Can you give us an example of an unexpected file name?

Would I be right in thinking you are on windows and using TortoiseSVN?

If so, you are seeing icon overlays that tell you the subversion status of all 
your files, have a read of the user guide:

http://tortoisesvn.net/docs/nightly/TortoiseSVN_en/tsvn-dug-wcstatus.html

There are other tools out there, for both windoze and *nix, that provide 
similar functionality, I just happen to use TortoiseSVN.

Also, please try to provide as much text info as you can, your original post is 
a bit vague!

~ mark c


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 already exist) and what were the 
commands you used to create the project and import the initial source 
code?  Finally, what do you mean by "every icon"?  Can you give us an 
example of an unexpected file name?


--
David Chapman dcchap...@acm.org
Chapman Consulting -- San Jose, CA



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.


IMPORTANT NOTICE.  The information contained in this electronic message and any 
attachments to this message are intended for the exclusive use of the 
addressee(s) and may contain confidential or privileged information. If you are 
not the intended recipient, or the employee or agent responsible for delivering 
this message to the intended recipient, you are hereby notified that you 
received this communication in error.  Any review, dissemination, distribution 
or copying of this communication is strictly prohibited.  If you receive this 
communication in error please send a return e-mail, and then delete this 
message, together with any attachments.


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 problem.
Please take the time to report this on the Subversion mailing list
with as much information as possible about what
you were trying to do.
But please first search the mailing list archives for the error message
to avoid reporting the same problem repeatedly.
You can find the mailing list archives at
http://subversion.apache.org/mailing-lists.html

Subversion reported the following
(you can copy the content of this dialog
to the clipboard using Ctrl-C):

In file
'D:\Development\SVN\Releases\TortoiseSVN-1.7.2\ext\subversion\subversion\libsvn_subr\mergeinfo.c'
line 1152: assertion failed (IS_VALID_FORWARD_RANGE(second))
---
OK

Kind regards,

Péter SZABADY
Senior Developer

NNG Kft. | Bérc u. 23., H-1016, Budapest, HUNGARY | Tel.: +36 (1) 872- | 
Fax: +36 (1) 872-0100 |
E-mail: peter.szab...@igomyway.com | 
www.igomyway.com



[cid:imagea84aa9.gif@124a808c.bef34c47]

This message, including its attachments is confidential. For more information 
please read the e-mail policy of NNG here:
http://www.igomyway.com/nngemailpolicy/
Responding to this e-mail you accept the email policy.

<>

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 AM
To: users@subversion.apache.org
Cc: George Reimer
Subject: Re: Subversion Exception!

Am 06.12.2011 23:50, schrieb George Reimer:
> A fresh checkout of a folder under subversion control.

Reproducible?


> My D drive is a DVD drive. (empty)

Irrelevant, the path in the error message refers to a path on the 
developer's machine, not yours.


> [...] with as much information as possible about what
> you were trying to do.

What did you do, where to, where from...?


> But please first search the mailing list archives for the error message
> to avoid reporting the same problem repeatedly.

And please do that the next time, too.


> 'D:\Development\SVN\Releases\TortoiseSVN-1.7.0\ext\subversion\subversion
> \libsvn_wc\workqueue.c'
>
>   line 672: assertion failed (checksum != NULL)

This has been reported all over and is at least partially adressed in 
the newer versions 1.7.1 and 1.7.2. Upgrade first, and if the problem 
persists report it again as mentioned above.

Uli
**
Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland
Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932
**
Visit our website at http://www.dominolaser.com
**
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten 
bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen 
Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein 
sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, 
weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte 
Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht 
verantwortlich.
**