Re: [TSVN] Merge Questions

Brad Rhoads wrote:

[snip]
> So assume we have URLs ../trunk and ../MyBranch. My goal is to get the
> changes made in MyBranch into trunk.
>
> 1. What URL do specify in the From section.

/MyBranch

> 2. What Rev to I specify in the From section.

the revision where you've created the branch. Use the "show log" command
to find out if you don't remember this anymore.

> 3. What URL do I specify in the To section?

/MyBranch

> 4. What Rev do I specify in the To section?

HEAD.

> 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.

Stefan

---------------------------------------------------------------------
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:42 2004