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

Notifications when merge aborts due to conflicts

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-09-12 17:23:40 CEST


Starting to test this feature to implement in the merge client. Is
this what you expected the command line output to look like? It seems
like the line breaks are not right:

$ svn merge -g
--- Merging r5 through r8:
U src/com/collabnet/banking/tests/BankingTests.java
Conflict discovered in 'src/com/collabnet/banking/models/BankAccount.java'.
Select: (p)ostpone, (d)iff, (e)dit, (h)elp : p
C src/com/collabnet/banking/models/BankAccount.java
U docs/products/index.html
U docs/about/index.html
subversion/libsvn_client/merge.c:2184: (apr_err=155015)
svn: One or more conflicts were produced while merging r4:8 into
'.' --
resolve all conflicts and rerun the merge to apply the remaining
unmerged revisions

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Sep 12 17:20:15 2007

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