easy-to-use cross-platform changeset-oriented revision control system

Damien Kick | 25 Apr 2011 23:38

Branch, merge, and unknown files

Regarding svn, version 1.6.13 (r1002816):

I have a trunk branch, we'll call it trunk, from which I copied to
make a development branch, we'll call it dev.

$ svn cp $SVN_ROOT/branches/trunk $SVN_ROOT/branches/dev

Recently, I rebased against trunk.

$ svn merge $SVN_ROOT/branches/trunk
$ svn ci -m "Rebase with trunk."

Now ... somehow I've got things in a state in which files which were
added by someone else to trunk are showing up on my dev branch as '?'.

$ svn st
? sub/dir/file.h

If I check out a new copy of my dev branch, those files are indeed not
on the branch.

I'm not sure how I got to this state.  ~shrug~ Fine.  But attempting
to add the file gives me.

$ svn add sub/dir/file.h
$ svn st
A sub/dir/file.h
$ svn ci
svn: Commit failed (details follow):
svn: File '$SVN_ROOT/branches/dev/sub/dir/file.h' already exists

(Continue reading)

headers

Ben Alex | 25 Jun 2007 11:28

OT: Invitation to participate in research project

Hello there

I would greatly appreciate a small amount of your time to assist with
my doctoral research at The University of Newcastle. The research
concerns open source licensing and we're seeking developers working on
Java projects. The research is supervised, ethics-approved, anonymous
and results will be freely available. Participation will also provide a
custom licensing report for your project. To learn more, please visit:

   http://licensing-research.newcastle.edu.au

Thanks for reading this email, and I hope you'll consider participating.

Best regards
Ben Alex

(My apologies for being off-topic; this list will not be emailed again)

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

headers

EShin Yen | 21 Jun 2007 01:27

Re: How to setup client connection:

Thank you,
Everything worked as you said.

David.

Date: Wed, 20 Jun 2007 13:50:53 -0400
From: owenc <at> totalsales.com
To: superversion-discussion <at> lists.sourceforge.net
Subject: Re: [superversion] How to setup client connection:

EShin Yen wrote:
.ExternalClass P {padding:0px;} .ExternalClass {font-size:10pt;font-family:Tahoma;} 1. Is there any way to download the client jar file(s) and batch files to run everything locally instead of doing java webstart every time?

Go to http://superversion.org/download.html
Right click and Save As on the "client.jlnp" version that you are using
You shouldn't need any batch files for your client copy of Superversion
2. Once I started the client (with java web start), it asked me to specify the db directory. Well, I did when I run client and the server in the same machine. Now, I want to connect to the superversion server from a remote machine. How do I setup the client on the remote machine? The client won't let me in without setup DB location first. Moreover, there is nowhere in the client to specify the remote server's IP address or port.

The client also keeps its own DB to keep track of the code on your client machine. This is not the same as the DB that the server uses, so just create a new directory on your client machine for this.

(When you are running client and server on the same machine, you probably don't want to specify the same DB directory for both.. I'm just guessing, but this might have adverse effects)

Once you have setup the DB on your client machine and Superversion starts, you should see a welcome screen that has 3 large icons on the left pane: Local Projects, Remote Projects, Server Admins. Click on Remote Projects and enter the IP address of your server there.

Checkout the project you wish to have on your local machine. On the next screen click "Add work area". It should walk you through the rest.

Hope this helps,
Owen

Hotmail to go? Get your Hotmail, news, sports and much more! Check out the New MSN Mobile

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

_______________________________________________
superversion-discussion mailing list
superversion-discussion <at> lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/superversion-discussion

headers

EShin Yen | 20 Jun 2007 19:33

How to setup client connection:

Hi,
I am new to the superversion system. I can start my server easily with the port setup to be 88 and specify the db directory. However, I have 2 questions.

1. Is there any way to download the client jar file(s) and batch files to run everything locally instead of doing java webstart every time?

2. Once I started the client (with java web start), it asked me to specify the db directory. Well, I did when I run client and the server in the same machine. Now, I want to connect to the superversion server from a remote machine. How do I setup the client on the remote machine? The client won't let me in without setup DB location first. Moreover, there is nowhere in the client to specify the remote server's IP address or port.

Please help.

David.

Change is good. See what's different about Windows Live Hotmail. Check it out!

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

_______________________________________________
superversion-discussion mailing list
superversion-discussion <at> lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/superversion-discussion

headers

Jorgen Bodde | 23 Feb 2007 10:26

Superversion Dead?

Hi,

It has been a long time since any updates. I wonder if there will be
any in the future. I am now facing a decision to either use
Superversion or SVN. I tend to use the latter because it is still
developed. If Superversion is still in development, I will stick to
it.

Regards,
- Jorgen

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

headers

Thomas Paul | 7 Nov 2006 11:55

Feature Request: Single File Export via History Window

Hi,

I'm using SuperVersion 1.2 for my private purposes (single user only) and
over all I'm very satisfied with the handling of the program. But there's
some little feature I'm missing. It would be great to have the ability to
export any special version of a single file via the "File History" dialog.
The only chance to do that now is to go to the "Project History" and then
use the "State Inspector" dialog (right click on the file name). The
disadvantage going this way, is that the "State Inspector" holds the list of
all files belonging to the project and therefore it's not so easy to
navigate to the one interest.

Finishing my request I have a more fundamental question: Is there any
progress in the development of the single user version 1.2 or am I forced to
migrate to version 2.0 even though I'm not interested in any multi-user
features offered by 2.0?

Thanks!
Thomas.

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

headers

Robert Blenis | 18 Jul 2006 13:02

is public server still down

I still can't get connected to the public superversion server. It 
appears to have been down this past week. Help!

Robert

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

headers

Otan | 18 Jul 2006 11:13

the wonderful superversion's diff tool

Greetings!

Is superversion using a third party diff library for Java? If yes, what is it and where can I get it from? If not, can I get the particular diff source code out from the superversion's source code and use it for my application? Thanks.

In service to humanity,
Otan

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

_______________________________________________
superversion-discussion mailing list
superversion-discussion <at> lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/superversion-discussion

headers

dean | 17 Jul 2006 21:30

A message to my wonderful clients from Dean Waters:

A message to my wonderful clients from Dean Waters:

I have very much enjoyed working with you all, but am taking 
another step on my career path.  As of Thursday, January 5, 
2006 I will no longer be working for Saratoga Online/Spa.Net 
and will be passing the web design baton to Gaby Shearer.  
Many of you know and have worked with her, but for those of 
you who have not, she will serve you well in the coming 
months and years.  If you have any questions about this 
transition you can contact with either Dom or Gaby:

Dom <at> spa.net
Gabys <at> spa.net

Once again, thank you for the chance to work with you on 
growing your web sites.  I'm going to miss working with you 
all!

Dean Waters

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

headers

dean | 16 Jul 2006 21:12

A message to my wonderful clients from Dean Waters:

A message to my wonderful clients from Dean Waters:

I have very much enjoyed working with you all, but am taking 
another step on my career path.  As of Thursday, January 5, 
2006 I will no longer be working for Saratoga Online/Spa.Net 
and will be passing the web design baton to Gaby Shearer.  
Many of you know and have worked with her, but for those of 
you who have not, she will serve you well in the coming 
months and years.  If you have any questions about this 
transition you can contact with either Dom or Gaby:

Dom <at> spa.net
Gabys <at> spa.net

Once again, thank you for the chance to work with you on 
growing your web sites.  I'm going to miss working with you 
all!

Dean Waters

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

headers

dean | 15 Jul 2006 21:11

A message to my wonderful clients from Dean Waters:

A message to my wonderful clients from Dean Waters:

I have very much enjoyed working with you all, but am taking 
another step on my career path.  As of Thursday, January 5, 
2006 I will no longer be working for Saratoga Online/Spa.Net 
and will be passing the web design baton to Gaby Shearer.  
Many of you know and have worked with her, but for those of 
you who have not, she will serve you well in the coming 
months and years.  If you have any questions about this 
transition you can contact with either Dom or Gaby:

Dom <at> spa.net
Gabys <at> spa.net

Once again, thank you for the chance to work with you on 
growing your web sites.  I'm going to miss working with you 
all!

Dean Waters

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

1	April 2011
5	June 2007
1	February 2007
1	November 2006
11	July 2006
1	June 2006
2	May 2006
4	April 2006
7	March 2006
3	February 2006
26	January 2006
5	December 2005
15	November 2005
15	October 2005
10	September 2005
27	August 2005
4	July 2005

Mon	Tue	Wed	Thu	Fri	Sat	Sun

		1	2	3	4	5
6	7	8	9	10	11	12
13	14	15	16	17	18	19
20	21	22	23	24	25	26
27	28	29	30	31