|
From: | Jordi Gutiérrez Hermoso |
Subject: | [Octave-patch-tracker] [patch #7857] Replace dynamic casts of GUI/IDE editor with more slots/signals configuration |
Date: | Fri, 26 Oct 2012 19:12:35 +0000 |
User-agent: | Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20110109 Webzebra/3.6.13 |
Follow-up Comment #5, patch #7857 (project octave): > Since there were some new revisions in the meantime the import of > the patch aborted and I had to resolve some conflicts by hand. Do "hg import --exact" to apply the patch at the location where it was created. If the patch isn't corrupt, it will apply cleanly there. Then you can do "hg rebase" to move it to the new location and use your usual merge tools to fix whatever conflicts there may have been. _______________________________________________________ Reply to this item at: <http://savannah.gnu.org/patch/?7857> _______________________________________________ Message sent via/by Savannah http://savannah.gnu.org/
[Prev in Thread] | Current Thread | [Next in Thread] |