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

RE: I need help understanding a problem with merges

From: Toal, Michael (GE EntSol, Intelligent Platforms) <michael.toal_at_gefanuc.com>
Date: Tue, 1 Jul 2008 13:59:29 +0100

Do you have a commitment phobia?

Michael Toal
GE Fanuc Intelligent Platforms
Software Engineer
Embedded Systems
 
Telephone: +44 (0) 1344 465200
Direct Dial: +44 (0) 1344 464917
Fax: +44 (0) 1344 465201
Email: michael.toal_at_gefanuc.com
Web: www.gefanuc.com, www.octec.co.uk
 
 
12-13 Western Centre, Western Road,
Bracknell, Berkshire.
RG12 1 RW.
United Kingdom
 
Radstone Ltd, registered in England and Wales (3828642) at Tove Valley
Business Park, Towcester, Northants NN12 6PF, VAT GB 729 849 476
Radstone Technology Plc, registered in England and Wales (2151516) at
Tove Valley Business Park, Towcester, Northants NN12 6PF, VAT GB 729 849
476
Octec Ltd, registered in England and Wales (2393111) at Tove Valley
Business Park, Towcester, Northants NN12 6PF, VAT GB 530 094 183
 
GE Fanuc Intelligent Platforms Confidential and Proprietary. If you have
received this message in error please notify us immediately and
permanently remove it from your system and destroy any printed
hardcopies.
-----Original Message-----
From: Assaf Stone [mailto:stoneas_at_gmail.com]
Sent: 01 July 2008 13:47
To: users_at_tortoisesvn.tigris.org
Subject: I need help understanding a problem with merges

Hi. I'm rather new to SVN, and came across a serious problem. I'm not
sure whether it's me, or SVN, or the tortoise.

I created a project, and added a trunk. In the trunk I added a text
file, with several lines of text.
I then branched to two branches: "A" and "B".

In "A". I added a few lines, and then from the trunk, I merged from
the trunk to "A". And it worked.

Then, in "B" I changed a few of the lines intially there.

When I attempted to catch up on the changes to the trunk (from "B" to
trunk, into "B"), I got an error "Skipped missing target". When I
diffed, I saw the changes to "B" removed, and the text in the trunk
(the new additions from "A") added.

What I expected to see was a file including all of the changes.

Is what I'm doing wrong? Am I doing it wrongly?

Thanks,
Assaf.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-07-01 14:59:48 CEST

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