You need to log in before you can comment on or make changes to this bug.
Want to clean up Update, Revert, Rollback (Strip - #126151) and Backout (126031) support. So this is a series of enhancements. Update: add in revision selection dialog and tell user that they will update the working dir's parent. If they do this with anything other than the tip revision, subsequent commits will be against this parent and you will have multiple heads. Update the working directory to the selected revision. Update sets the parent of the working directory to this revision. Revert: already working, just add some explanatory text so they know they are only updating the working dir and not effecting the repository (the working dir parent is NOT update). Revert selected files to their state as of the chosen revision. Revert only modifies the working directory.
Created an attachment (id=56702) [details] mercurial-backout-strip-update-revert.jpg
Trying to rationalize the various dialogs and make them consistent in how they work and what they tell the user - see attachment.
Maros, Can you give us some idea of what we need to do here. I have looked at the wiki page and could not find anything.
I do not understand the question. And what wiki page are you referring to?
Sorry. wrong bug.
Created an attachment (id=56929) [details] Rework of update, revert, adding Strip, Backout main_work_67893_3aef657fdd9c-127399-update-and-others-rev1.patch
Now have the following: Update: allows you to update to any revision and also do a forced update if you want. This will reset the working dir parent dir. Use View to see this happen. Revert: allow you to revert to any revision you want in the working dir. Will only update the working dir. It will have no effect on the repository. To undo simply do an Update and choose Force Update to get working dir back in sync with repository. You can also choose to backup any locally modified files before reverting to <file>.orig Strip: allows you to strip a revision out of the repository, including all of its descendants. This can only be run if there are no local mods (again just run Update - Forced Update, to discard local changes first). You can have Strip backup the changes in bundle file that can be reapplied using hg unbundle to reverse the Strip. Instructions are given in the Output Window to make this simple to do. Backout: backout a changeset selectively. It will create a new backout changeset and commit this to the repo with teh specified commit message. If this creates multiple heads you will be given the option to Merge. If you do a Merge will happen and you can commit the results to complete the backout. We are using the same Merge code as in Pull/ Push and so it will detect conflicts, which you can resolve using Resolve Conflicts menu. Rollback: as before rollback the last transaction, commit, push/pull or unbundle. It warns you first before running the command, stressing that it cannot be undone. bash-3.2$ hg out comparing with https://jrice:eXjl7Ph3@hg.netbeans.org/main searching for changes changeset: 68434:c8dddf58cfab user: jrice@netbeans.org date: Wed Feb 20 14:45:50 2008 +0000 summary: #127399: Update, revert, strip and backout - rework of these and rollback to give user a lot more control working with repos from IDE changeset: 68567:37f58b741c3e tag: tip parent: 68434:c8dddf58cfab parent: 68566:29e431b90c8b user: jrice@netbeans.org date: Wed Feb 20 20:48:49 2008 +0000 summary: Automated merge with http://hg.netbeans.org/main bash-3.2$ hg push pushing to https://jrice:eXjl7Ph3@hg.netbeans.org/main searching for changes adding changesets adding manifests adding file changes added 2 changesets with 32 changes to 32 files notify: sending 1 subscribers 1 changes bash-3.2$
