On Tue, Mar 30, 2010 at 4:25 PM, Bob Archer <bob.arc...@amsi.com> wrote:
>> On Fri, Mar 26, 2010 at 5:11 PM, Tyler Roscoe <ty...@cryptio.net> wrote:
>>
>> > On Fri, Mar 26, 2010 at 03:17:54PM +0100, Xavier Noria wrote:
>> >> Even if I try to fix it by hand with
>> >>
>> >> svn merge -r2:2909 ^/trunk --record-only
>> >>
>> >> a subsequent merge still tries to get 2 through 2909. Moreover
>
>
> Did you do a commit after doing the --record-only merge?
Nope, someone else in the project did. Right after I branched from trunk:
cd into branches/someplace
svn co branchURL
cd branch name
now to check the strange behavior:
svn merge --dry-run ^/trunk
confirm the mysterious r2 to r2909 appearing, with tree conflicts etc.
(they are really old).
svn log
on the other side shows all the history down to r1.
Then
svn merge -r2:2909 ^/trunk --record-only
Just returns a prompt, silently, and if we try again
svn merge --dry-run ^/trunk
that still tries to merge r2 to r2909.
