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

RE: [TSVN] Merge Questions

From: Brad Rhoads <brhoads_at_zethcon.com>
Date: 2004-08-12 23:47:27 CEST

>
> > Also, I was playing with today ended up with a new folder
> named after
> > my branch in my trunk working copy instead merged files. The folder
> > had a big + sign on it. Please explain.
>
> I guess you're talking about the command line client and the 'svn st'
> command. The "+" sign tells you that the folder is "added" to
> your working copy and will be added to the repository on your
> next commit.
>

Nope, I did the TSVN Merge. Used /MyBranch in both From & To. From Rev was 1
< the rev that created the branch (this was wrong) and To Rev was the last
rev in the branch (same as HEAD, right?).

I'll try and do it right and see what happens.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 13 09:08:53 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.