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

interactive prompt for merge in --dry-run

From: Tyler Mace <twm_at_thermoanalytics.com>
Date: Wed, 03 Jun 2009 07:57:51 -0400

I was prompted to edit a conflict during a dry-run. I do not expect to
prompt for an edit in dry-run mode.

Interestingly, the SVN client didn't prompt me for editing my conflicts
of normal files. However, it DID prompt me for editing my conflict on a
property. Here's my output: (some names have been changed to protect
their identity)

twm_at_mohr 499 /work/taitherm-merge> svn merge --dry-run --ignore-ancestry
svn://gauss/taitherm/branches/TaiTherm-sprint2009-07 -r9895:9940
--- Merging r9896 through r9940 into '.':
A regular files which are new in this set...
G regular files which already had pending changes...
U regular files which had simple patches applied...
C src/foo.cpp [see, no prompt- this file was already in conflict
before the merge command]
C src/foobar.cpp [again, no prompt]
Conflict for property 'svn:externals' discovered on ''.
Select: (p) postpone, (df) diff-full, (e) edit,

Is interactive prompting supposed to happen?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-03 14:02:43 CEST

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