Re: svn commit: r34373 - branches/tc_url_rev/notes/tree-conflicts

On Mon, 2008-11-24 at 11:29 +0100, Arfrever Frehtes Taifersar Arahesis
wrote:
> 2008-11-24 06:12 <neels_at_tigris.org> napisał(a):
> > Author: neels
> > Date: Sun Nov 23 21:12:45 2008
> > New Revision: 34373
> >
> > Log:
> > On branch tc_url_rev:
> > Add a file that was added on trunk but wasn't added to the branch when
> > syncing to trunk (with both 1.5.4 and 1.5.1).
> > ### The merge should have added the file.
> >
> > Added:
> > branches/tc_url_rev/notes/tree-conflicts/use-cases-resolution.txt (props changed)
> > - copied unchanged from r34372, trunk/notes/tree-conflicts/use-cases-resolution.txt
>
> Please remove svn:mergeinfo on this file.

r34380.

- Julian

---------------------------------------------------------------------
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 16:33:50 CET