Right, it works with svn 1.6. It's 1.7 that doesn't work.
> ./svn-undelete.sh
### Making a Greek Tree for import...
### Done.
### Importing it...
Committed revision 1.
### Done.
### This is where your reproduction recipe goes. ###
D A/D
D A/D/G
D A/D/G/pi
D A/D/G/rho
D A/D/G/tau
D A/D/H
D A/D/H/chi
D A/D/H/omega
D A/D/H/psi
D A/D/gamma
Deleting A/D
Committed revision 2.
Updating '.':
At revision 2.
--- Reverse-merging r2 into '.':
A A/D
A A/D/gamma
A A/D/G
A A/D/G/pi
A A/D/G/rho
A A/D/G/tau
A A/D/H
A A/D/H/chi
A A/D/H/omega
A A/D/H/psi
--- Recording mergeinfo for reverse merge of r2 into '.':
U .
--- Eliding mergeinfo from '.':
U .
svn: E200009: Commit failed (details follow):
svn: E200009: '/home/fergus/downloads/wc/A/D/H' is not under version control
and is not part of the commit, yet its child
'/home/fergus/downloads/wc/A/D/H/psi' is part of the commit
On 11/13/2011 11:30 PM, Daniel Shahaf wrote:
On Sunday, November 13, 2011 11:07 PM, "Fergus Slorach"<sug...@gmail.com>
wrote:
Hi Daniel,
Thanks for the quick response.
Here's the recipe - this works in 1.6 but fails with 1.7
All the best,
fergus
Thanks for the script. It appears to work for me using the system's svn 1.6.17:
[[[
daniel@tarsus:/tmp> sh ./svn-undelete.sh
### Making a Greek Tree for import...
### Done.
### Importing it...
### Done.
### This is where your reproduction recipe goes. ###
D A/D/gamma
D A/D/G/pi
D A/D/G/rho
D A/D/G/tau
D A/D/G
D A/D/H/chi
D A/D/H/omega
D A/D/H/psi
D A/D/H
D A/D
Deleting A/D
Committed revision 2.
At revision 2.
--- Reverse-merging r2 into '.':
A A/D
A A/D/gamma
A A/D/G
A A/D/G/pi
A A/D/G/rho
A A/D/G/tau
A A/D/H
A A/D/H/chi
A A/D/H/omega
A A/D/H/psi
Adding A/D
Adding A/D/G
Adding A/D/G/pi
Adding A/D/G/rho
Adding A/D/G/tau
Adding A/D/H
Adding A/D/H/chi
Adding A/D/H/omega
Adding A/D/H/psi
Adding A/D/gamma
Committed revision 3.
daniel@tarsus:/tmp> svn --version -q
1.6.17
daniel@tarsus:/tmp>
]]]
Is that the expected "works as intended" output? What version of 1.6.x
are you using? Could you try upgrading to 1.6.17?
Daniel
