Re: Merge confusion ...
From: Ryan Schmidt <subversion-2011a_at_ryandesign.com>
Date: Sun, 23 Jan 2011 18:55:26 -0600
On Jan 23, 2011, at 17:32, Bill Waggoner wrote:
> This is a confused newbie question about merge. I'll try to be brief ...
It sounds like they did not use "svn merge" to cause this problem; they just copied a bad file into the directory and committed it. So I wouldn't use "svn merge" to try to fix it. (Using "svn merge" to try to merge revision 8 would try to also record the fact that it is merging revision 8, which would cause it some difficulty since, as far as it knows, revision 8 is already there). I would just use "svn diff -c8" to get the changes for revision 8 and apply that diff to the file, then commit it.
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.