How to merge changes from two branches and test before committing to trunk?

104 views Asked by At

i've got work in two branches and one depends on changes in the other, i.e. I want to test both branches combined before I go ahead and commit trunk to the repository. what I tried is to --reintegrate branch A into branch B (with the intention that I can commit branch B and then intgrate those combined changes into trunk for testing) but I got this:

user@jpax-build07:~/src/branch/B$ svn merge --reintegrate ^/branch/A 
svn: E160013: '/svn/NextGen/!svn/rvr/25347/branch/A' path not found
user@jpax-build07:~/src/branch/B$ svn info 
Path: .
Working Copy Root Path: /home/user/src/project
URL: https://svn-server:8443/svn/branch/B
Relative URL: ^/branch/A
Repository Root: https://svn-server:8443/svn/project
Repository UUID: e326255c-0818-144b-bcb2-52792ac9bef0
Revision: 25685
Node Kind: directory
Schedule: normal
Last Changed Author: user
Last Changed Rev: 25662
Last Changed Date: 2019-10-29 09:30:06 -0700 (Tue, 29 Oct 2019)

user@jpax-build07:~/src/branch/B$ svn up 
Updating '.':
At revision 25685.
user@jpax-build07:~/src/branch/B$

Why does it not let me do this plus what's this '/svn/NextGen/!svn/rvr/25347/branch/A' path not found? Is this because the branches did not both exist at some revision in the past? How do I do this done?

0

There are 0 answers