On Thu, Aug 20, 2009 at 10:18 AM, Firmicus<Firmicus@gmx.net> wrote:
Aaron Griffin a écrit :
On Thu, Aug 20, 2009 at 10:10 AM, Firmicus<Firmicus@gmx.net> wrote:
Aaron Griffin a écrit :
Geez, something is truly screwed with svn merge... After updating to 1.84-1 and commiting in trunk, I get this:
$ archrelease extra-i686 svnmerge: no integration info available Nothing to commit
I've seen this happen to other people once or twice, but it's never happened to me...
try completely "svn rm"ing the repos/extra-i686 dir, and then rerunning archrelease extra-i686
I did it too, but it was of no help. :(
Hmm? If the directory isn't there, svnmerge will not be used, so the error will be the same. Make sure you svn commit after removing the dir
Of course, but I ran svn update in the asymptote dir after removing the repos/extra-i686 dir. Why should I run svn commit? The trunk is already committed, and I only need to merge it with the repos dirs. This is that merge operation that keeps failing.
You need to commit the removal. Updating it will just update to the current version on the server which DOESN'T have the removal recorded.