New submission from Pekka Pessi <[EMAIL PROTECTED]>: Looks like rolling back two depending patches does not work as expected.
--Pekka $ darcs --version 1.0.9 (release) $ sh rollback-bug + mkdir demo + cd demo + mkdir A + cd A + darcs init + cat + cat + cat + touch content + darcs add content + cp f1 content + darcs record -m p1 --all Finished recording patch 'p1' + cp f2 content + darcs record -m p2 --all Finished recording patch 'p2' + cp f3 content + darcs record -m p3 --all Finished recording patch 'p3' + : Cannot rollback p2 + darcs rollback --patch p2 Skipping depended-upon patch: Thu Oct 11 13:10:44 EEST 2007 Pekka Pessi <[EMAIL PROTECTED]> * p2 Cancelling rollback since no patch was selected. + : Do it in B + darcs put ../B Finished applying... + yes + darcs unpull --patch p3 --repo ../B Thu Oct 11 13:10:44 EEST 2007 Pekka Pessi <[EMAIL PROTECTED]> * p3 Shall I unpull this patch? (1/?) [ynWvpxqadjkc], or ? for help: Finished unpulling. + yes + darcs rollback --patch p2 --repo ../B Thu Oct 11 13:10:44 EEST 2007 Pekka Pessi <[EMAIL PROTECTED]> * p2 Shall I rollback this patch? [yNvpq], or ? for help: Finished rolling back. + : Rollback p3 + yes + darcs rollback --patch p3 Thu Oct 11 13:10:44 EEST 2007 Pekka Pessi <[EMAIL PROTECTED]> * p3 Shall I rollback this patch? [yNvpq], or ? for help: Finished rolling back. + darcs revert --all Finished reverting. + : We have UNDO p2 to pull + darcs pull ../B --dry-run Pulling from "../B"... Would pull the following changes: Thu Oct 11 13:10:44 EEST 2007 Pekka Pessi <[EMAIL PROTECTED]> UNDO: p2 Making no changes: this is a dry run. + : Pull it + darcs pull ../B --all Pulling from "../B"... Finished pulling and applying. + : Now we have rollback for p2 and p3 + darcs changes Thu Oct 11 13:10:44 EEST 2007 Pekka Pessi <[EMAIL PROTECTED]> UNDO: p2 Thu Oct 11 13:10:44 EEST 2007 Pekka Pessi <[EMAIL PROTECTED]> UNDO: p3 Thu Oct 11 13:10:44 EEST 2007 Pekka Pessi <[EMAIL PROTECTED]> * p3 Thu Oct 11 13:10:44 EEST 2007 Pekka Pessi <[EMAIL PROTECTED]> * p2 Thu Oct 11 13:10:44 EEST 2007 Pekka Pessi <[EMAIL PROTECTED]> * p1 + : ..but + diff f1 content 4a5,6 > 12345 > 1234 Exit 1 ---------- files: exact-version, rollback-bug messages: 2165 nosy: beschmi, droundy, kowey, ppessi, tommy status: unread title: weird rollback behavior __________________________________ Darcs bug tracker <[EMAIL PROTECTED]> <http://bugs.darcs.net/issue547> __________________________________
rollback-bug
Description: Binary data
exact-version
Description: Binary data
_______________________________________________ darcs-devel mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-devel
