Merge question
From: James Ward <jimward2_at_gmail.com>
Date: Thu, 25 Sep 2008 16:02:18 -0400
We use Subversion (version 1.5.1 (r32289)), but our baseline
In January, they gave us a disk with baseline version 10.
In April, we gave them a disk with
Both sides develop in parallel.
In September, they gave us a disk with baseline version 11.
We want to merge our changes, revision 3020, with baseline
1. Take our changes from 2591 to 3020 and merge that
2. Take the changes from 2591 to 11v1 and merge into revision 3020.
We tried both approaches, and they both failed in the same manner.
What we tried (Linux, RedHat 5, csh):
1. Take our changes from 2591 to 3020 and merge that
cd ~
svn: Cannot replace a directory from within
2. Take the changes from 2591 to 11v1 and merge into revision 3020:
cd ~
svn: Cannot replace a directory from within
Thank you for all your help!
Sincerely,
Jim Ward
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.