Branching and Merging

1,598 views
Skip to first unread message

Devojyoti Aich

unread,
Apr 19, 2011, 4:23:01 AM4/19/11
to svnX
How to create Branch and merge using svnX?

chris

unread,
Apr 19, 2011, 10:10:22 AM4/19/11
to svnX
Hello Devojyoti,

On Apr 19, 9:23 am, Devojyoti Aich <dev.s...@gmail.com> wrote:
> How to create Branch and merge using svnX?

A branch is just a copy in Subversion. Use svnX’s repository window
copy command.

To merge using svnX 1.3 -
first ensure that the target of your merge is visible in a working
copy window,
then drag the source from a repository window & drop it on the WC
window.
A sheet should then open allowing you to customise the merge options &
preview the results.

Chris

kdb...@gmail.com

unread,
Jan 23, 2014, 11:38:58 AM1/23/14
to sv...@googlegroups.com, dev....@gmail.com
I'm trying this with 1.3.4 and here is my list of actions:

1 - Open SVNX
2 - Open the Repositories and Working Copies windows
3 - Double click on my destination in Working Copies to open a 'Working Copy Window' (trunk in this case)
4 - From the Repositories window grab the 7.0 branch and drop that line on the 'Working Copy Window'

Nothing happens.

I know that there are outstanding merges to be performed between 7.0 into the trunk as I just made a change to the 7.0 branch.

What am I doing wrong? I've done this in the deep past and now it isn't happening.

      David
Reply all
Reply to author
Forward
0 new messages