On 10/23/06, Martin Bähr <[EMAIL PROTECTED]> wrote: > On Mon, Oct 23, 2006 at 12:51:10AM +0200, Axel Liljencrantz wrote: > > If this is the problem, you should have two patches with the same > > commit message. You should then be able to delete both and pull the > > right one. > > ok, since i am not familiar with darcs yet, could you help me out with > the exact steps i need to do? (or point me to darcs docs that answer > this question?)
Sure. 1. The first step is to use 'darcs changes|less' to get a list of all applied patches. If you see two patches with the same commit message near the top, then the problem is I made a 'tweaked patch'. 2. If you found a duplicate patch in step one, use 'darcs unrecord' to drop patches. You will be presented with all patches in sequential order, newest first. Use 'n' to keep patches, 'y' to remove them. Once both the 'bad' patches are marked for deletion, press 'd' to delete those and keep the rest. 3. 'darcs unrecord' does not change the working copy of the tree, though, it only drops the patches in the darcs repo. So in order to remove the effects of the bad patches from the working copy, you should use 'darcs revert'. Unless you have made your own edits, you can just revert all changes. 4. Finally, use 'darcs pull' to get the the real version of the last patch. > > greetings, martin. > -- > cooperative communication with sTeam - caudium, pike, roxen and unix > offering: programming, training and administration - anywhere in the world > -- > pike programmer travelling and working in europe open-steam.org > unix system- bahai.or.at iaeste.(tuwien.ac|or).at > administrator (caudium|gotpike).org is.schon.org > Martin Bähr http://www.iaeste.or.at/~mbaehr/ > -- Axel ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fish-users mailing list Fish-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fish-users
