Merge individual files

[po...@tigris.org]

Hello,


I have one branch in my environment named "Live". Right now consider in folder called x we changed 4 files in trunk. but we want to just merge 2 of them with Live branch. Using tortoise, if I want to merge a single file, entering the URL of file /xxx/xsss/xxx/y.java, it shouts with this error :

Cant Replace a directory from within.


Any Advice?


Thanks,
N

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979749

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].

Re: Merge individual files

[Ryan Schmidt <su...@ryandesign.com>]

On Dec 4, 2008, at 12:01, postmaster@tigris.org wrote:

> I have one branch in my environment named "Live". Right now  
> consider in folder called x we changed 4 files in trunk. but we  
> want to just merge 2 of them with Live branch. Using tortoise, if I  
> want to merge a single file, entering the URL of file /xxx/xsss/xxx/ 
> y.java, it shouts with this error :
>
> Cant Replace a directory from within.

If you want help with TortoiseSVN, you need to ask on the  
TortosiseSVN Users mailing list.

However, using just the Subversion command line, you can merge just  
the two files, by issuing two merge commands, one for each file.

svn merge $REPO/path/to/file1 local/path/to/file1
svn merge $REPO/path/to/file2 local/path/to/file2
svn commit

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980274

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].