[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

newbie having trouble linking my code to the trunk

From: Phil Kaye <crystalcleardecisions_at_yahoo.com>
Date: Thu, 28 Apr 2011 12:27:19 -0700 (PDT)

please bear with me as I am new to SVN.

What happened was that I was given program codes that were working on
another developers' laptop. I had to make some changes to this code right
from the start because of the machine differences. I neglected to commit and
update the changes to SVN ( I was having diff. with this now I get the hang
of the basic process of SVN). I then also folded in many changes to the app
from a different program code app. This made a mess for me because this
other code was SVN'd to a different location and name.

The trunk branches to the Authentication branch which was at some point was
tagged DemoLaptop-20110323. Shouldn't the current code either be branched
from the trunk or be a continuation of the Authentication branch? how can i
rectify this?

One of the benefits of branching is that you can then merge the code back
into the trunk and continue where you left off. As it is, how am I going to
get the changes back into the trunk?

-- 
View this message in context: http://old.nabble.com/newbie-having-trouble-linking-my-code-to-the-trunk-tp31499693p31499693.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2725528
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-28 21:37:06 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.