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

Re: [TSVN] Merge bug 1.0.8

From: Stefan Küng <stefan.kueng_at_wagner-group.ch>
Date: 2004-08-18 11:29:42 CEST

Amir Kolsky wrote:

> I have a directory called "csUnit 1.9.4". It's under version control,
> and I've been futzing with it for awhile. It occured to me that I really
> should be doing vendor-branching with it so I decided to start over.
>
> As an aside - I can update to any revision, including 1 by clicking on
> the folder and selecting update to revision...
>
> So I decided to merge Head --> 1 to this folder.

from 1->HEAD would be better.

[snip]
> Clicking ok on the error message brings up a box saying Merge
> Finished... (which is another bug, as merge definitely did not finish
> :-) )...

not a bug, just a misunderstanding: The merge finished - it just
finished with an error message.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Aug 18 12:31:58 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.