[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: Assaf Stone <stoneas_at_gmail.com>
Date: Wed, 2 Jul 2008 03:52:49 -0700 (PDT)

No. Not particularly, why do you ask?

I did how ever finally find out what the problem was: SVN Merge is
extremely arcane about things. Catching up (trunk - to - branch)
apparently should be done FROM Trunk (last revision they were the
same) TO trunk (HEAD), and into the branch (WC).

On Jul 1, 3:59†pm, "Toal, Michael (GE EntSol, Intelligent Platforms)"
<michael.t..._at_gefanuc.com> wrote:
> 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.t..._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:ston..._at_gmail.com]
> Sent: 01 July 2008 13:47
> To: us..._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-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org- Hide quoted text -
>
> - Show quoted text -

---------------------------------------------------------------------
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-02 12:53:23 CEST

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