On Tue, Aug 15, 2006 at 04:00:21PM -0400, Srinivas Kotla wrote:
> Hi,
Hi . . .
>
> We noticed that when a new directory with new files is added to repository
> and then subsequently a merge is done to a different branch, the log is
> incomplete.
>
>
>
> [skotla@drew trunk]$ svn --version
>
> svn, version 1.3.0 (r17949)
>
> compiled Mar 1 2006, 17:05:34
>
>
>
> For example:
>
> [skotla_at_drew trunk]$ svn log -r 56 -v file:///home/skotla/skrepos
>
> ------------------------------------------------------------------------
>
> r56 | skotla | 2006-08-15 15:34:19 -0400 (Tue, 15 Aug 2006) | 2 lines
>
> Changed paths:
>
> A /sw/ws12/newdir
>
> A /sw/ws12/newdir/new.c
>
> A /sw/ws12/newdir/new.h
>
>
>
> This is a test for svn log.
>
>
>
> ------------------------------------------------------------------------
>
>
>
> [skotla_at_drew trunk]$ svn merge -r55:56 file:///home/skotla/skrepos/sw/ws12
>
> A newdir
>
> A newdir/new.h
>
> A newdir/new.c
>
>
>
> [skotla@drew trunk]$ svn ci -m "Check svn log after merge of new dir and
> files"
>
> Adding newdir
>
> Adding newdir/new.c
>
> Adding newdir/new.h
>
>
>
> Committed revision 57.
>
>
>
> [skotla_at_drew trunk]$ svn log -r 57 -v file:///home/skotla/skrepos/sw/trunk
>
> ------------------------------------------------------------------------
>
> r57 | skotla | 2006-08-15 15:36:06 -0400 (Tue, 15 Aug 2006) | 1 line
>
> Changed paths:
>
> A /sw/trunk/newdir (from /sw/ws12/newdir:56)
This is correct (or at least consistent).
This is telling you that it copied newdir, including it's contents, as
of r56 to /sw/trunk.
It's better that it does this for branches and tags rather than
listing every file that was in the tag or branch root. It would be
rather less clear, I think, if tags had every file listed separately.
Thanks,
Jamie
>
>
>
> Check svn log after merge of new dir and files
>
> ------------------------------------------------------------------------
>
>
>
> --
>
> Srinivas Kotla | BROADSOFT Inc.
> [1]Broadsoft Inc.
> P| 240.364.5260 Email| [2]skotla@broadsoft.com
> Mail| 220 Perry Parkway | Gaithersburg | MD 20877
>
>
>
> References
>
> Visible links
> 1. http://www.broadsoft.com/images/r1c1.gif
> 2. mailto:skotla@broadsoft.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 15 23:28:54 2006
