'svn merge' vs. diff/patch
From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-12-07 20:42:14 CET
I was talking with Paolo (one of the main Mono developers) in IRC
# check out a branch wc
# examine the patch on trunk (this shows a tiny addition to 'ChangeLog')
# now apply the same patch to the wc:
... the merge results in a huge conflict within 'ChangeLog', rather
What's going on here? Is it the fact that 'svn diff' is doing a
---------------------------------------------------------------------
|
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.