On Mon, Nov 24, 2008 at 06:15:35AM +0100, Neels J Hofmeyr wrote:
> Stefan Sperling wrote:
> > On Sun, Nov 23, 2008 at 05:30:50PM +0000, Stefan Sperling wrote:
> >> Hi,
> >>
> >> in r34288, I added this file on trunk:
> >
> >> For some reason, the file was not added in the sync-up commit
> >> I made in r34325. I don't really understand why this happened.
> >
> > I forgot to mention that throughout all of this, I was using svn
> > version 1.5.4 (r33841).
>
> Reproduced with 1.5.1. So that this problem doesn't harm the branch, I've
> done a
>
> svn cp \
> $svnrepos/trunk/notes/tree-conflicts/use-cases-resolution.txt \
> $svnrepos/branches/tc_url_rev/notes/tree-conflicts/use-cases-resolution.txt
> to fix the problem. We should try to reproduce this elsewhere in case we
> need to.
OK.
Question to merge-trackers:
Will --reintegrate'ing the branch still work now?
I would probably have waited for the reintegration merge and
resurrected the file before committing the merge result to
trunk (but this solution is no fun if there is more than
one file involved).
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-24 12:55:13 CET