And I was also mentioning to Bill that if he's only changing
libsvn_fs, maybe he only needs to keep *that* particular subdir of his
branch up to date. Then, in his working copy, he can switch his
libsvn_fs dir to the branch. It would be a heck of a lot less noise
and mess to deal with. :-)
Greg Stein <gstein@lyra.org> writes:
> Looks like you merged *and* changed the line endings on some of these files.
>
> Cheers,
> -g
>
> On Fri, Jan 10, 2003 at 02:10:00PM -0600, rassilon@tigris.org wrote:
> > Author: rassilon
> > Date: 2003-01-10 14:09:45 -0600 (Fri, 10 Jan 2003)
> > New Revision: 4326
> >
> > Modified:
> > branches/issue-1003-dev/subversion/clients/cmdline/add-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/checkout-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/cl.h
> > branches/issue-1003-dev/subversion/clients/cmdline/commit-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/copy-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/delete-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/export-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/feedback.c
> > branches/issue-1003-dev/subversion/clients/cmdline/import-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/merge-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/mkdir-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/move-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/resolve-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/revert-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/status-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/switch-cmd.c
> > branches/issue-1003-dev/subversion/clients/cmdline/update-cmd.c
> > branches/issue-1003-dev/subversion/libsvn_fs/dag.c
> > branches/issue-1003-dev/subversion/libsvn_fs/reps-strings.c
> > branches/issue-1003-dev/subversion/libsvn_fs/reps-strings.h
> > branches/issue-1003-dev/subversion/libsvn_wc/log.h
> > branches/issue-1003-dev/subversion/tests/fs-helpers.c
> > Log:
> > Merges the 4323:4325 changes from trunk into the issue-1003-dev
> > branch.
> >...
>
> --
> Greg Stein, http://www.lyra.org/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jan 10 22:34:39 2003