Philip Martin wrote:
> Julian Foad <julian.foad_at_wandisco.com> writes:
>
> > I am not saying there are no problems with such copies/moves, just I
> > don't see a problem with the conflict-source info.
>
> Issue 3899 is not about repository locations but about the
> left/right/mine files in ACTUAL_NODE.
>
> Suppose file "A/f" is in conflict:
>
> $ sqlite3 wc/.svn/wc.db "select * from actual_node"
> 1|A/f|A||A/f.r2|A/f.r7|A/f.mine||||||||
>
> Now copy A to B:
>
> $ sqlite3 wc/.svn/wc.db "select * from actual_node"
> 1|A/f|A||A/f.r2|A/f.r7|A/f.mine||||||||
> 1|B/f|B||A/f.r2|A/f.r7|A/f.mine||||||||
>
> See how B/f is in conflict but refers to the A/f files.
Thanks Philip. That makes sense. That would need to be re-written in
order to remain correct.
- Julian
Received on 2011-05-26 18:06:29 CEST