[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

patch msgs showing for merged files

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-01-31 17:00:26 CET

I have a feeling this is related to the recent changes around
svn_io_run_cmd... When "svn update" merges changes into locally
modified files, patch's chattiness gets printed to the screen (not
sure if to stderr or stdout).

Is this a known issue? I couldn't find it in the issue tracker, but I
recall there was still some mop-up work to do with subprocess
invocation, perhaps involving APR changes. If this problem is stilll
known to be outstanding, it's probably time to make an issue for it.
Anyone know more of the history here?

   subversion$ svn up
   U ./subversion/svnadmin/main.c
   U ./subversion/svnadmin/shell.c
   U ./subversion/include/svn_types.h
   U ./subversion/include/svn_config.h
   U ./subversion/include/svn_wc.h
   patching file svn_client.h
   Hunk #3 succeeded at 218 (offset 7 lines).
   Hunk #5 succeeded at 262 (offset 7 lines).
   Hunk #7 succeeded at 290 (offset 7 lines).
   Hunk #9 succeeded at 339 (offset 7 lines).
   Hunk #10 succeeded at 542 (offset -5 lines).
   Hunk #11 succeeded at 590 (offset 7 lines).
   Hunk #12 succeeded at 595 (offset -5 lines).
   Hunk #13 succeeded at 637 (offset 7 lines).
   Hunk #14 succeeded at 639 (offset -5 lines).
   Hunk #15 succeeded at 706 (offset 7 lines).
   G ./subversion/include/svn_client.h
   U ./subversion/include/svn_pools.h
   U ./subversion/include/svn_ra.h
   U ./subversion/libsvn_fs/dag.c
   U ./subversion/libsvn_fs/tree.c
   U ./subversion/libsvn_fs/txn.c
   U ./subversion/libsvn_fs/id.c
   U ./subversion/libsvn_wc/entries.c
   U ./subversion/libsvn_wc/copy.c
   U ./subversion/libsvn_wc/adm_crawler.c
   U ./subversion/libsvn_wc/log.c
   U ./subversion/libsvn_wc/adm_ops.c
   U ./subversion/libsvn_subr/svn_error.c
   U ./subversion/libsvn_ra_local/ra_plugin.c
   U ./subversion/libsvn_client/switch.c
   U ./subversion/libsvn_client/delete.c
   U ./subversion/libsvn_client/revert.c
   patching file diff.c
   Hunk #1 succeeded at 275 (offset 22 lines).
   G ./subversion/libsvn_client/diff.c
   U ./subversion/libsvn_client/copy.c
   U ./subversion/libsvn_client/update.c
   U ./subversion/libsvn_client/status.c
   U ./subversion/libsvn_client/add.c
   U ./subversion/svnlook/main.c
   U ./subversion/bindings/ruby/wc.c
   U ./subversion/bindings/ruby/util.c
   U ./subversion/bindings/ruby/client.c
   A ./subversion/bindings/ruby/extconf.rb
   U ./subversion/mod_dav_svn/log.c
   U ./subversion/mod_dav_svn/update.c
   U ./subversion/mod_dav_svn/repos.c
   U ./subversion/clients/cmdline/cl.h
   U ./subversion/clients/cmdline/mkdir-cmd.c
   U ./subversion/clients/cmdline/move-cmd.c
   U ./subversion/clients/cmdline/revert-cmd.c
   U ./subversion/clients/cmdline/copy-cmd.c
   U ./subversion/clients/cmdline/update-cmd.c
   U ./subversion/clients/cmdline/add-cmd.c
   U ./subversion/clients/cmdline/switch-cmd.c
   U ./subversion/clients/cmdline/delete-cmd.c
   U ./subversion/clients/cmdline/feedback.c
   U ./subversion/clients/cmdline/main.c
   U ./subversion/tests/libsvn_fs/fs-test.c
   U ./subversion/libsvn_delta/xml_parse.c
   U ./subversion/libsvn_ra_dav/merge.c
   U ./subversion/libsvn_ra_dav/log.c
   U ./subversion/libsvn_ra_dav/props.c
   U ./subversion/libsvn_ra_dav/fetch.c
   U ./INSTALL
   U ./notes/merging-and-switching.txt
   U ./README
   U ./HACKING
   subversion$ svn --version
   Subversion Client, version 0.8.0
      compiled Jan 28 2002, 16:25:55
   
   Copyright (C) 2000-2002 CollabNet.
   Subversion is open source software, see http://subversion.tigris.org/
   
   The following repository access (RA) modules are available:
   
   * ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
     - handles 'http' schema
   * ra_local : Module for accessing a repository on local disk.
     - handles 'file' schema

   subversion$

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:01 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.