Please use the Apache issue tracking system for new NetBeans issues (https://issues.apache.org/jira/projects/NETBEANS0/issues) !!
Bug 127399 - Update to a specified revision
Update to a specified revision
Status: RESOLVED FIXED
Product: versioncontrol
Classification: Unclassified
Component: Mercurial
6.x
All All
: P3 (vote)
: TBD
Assigned To: issues@versioncontrol
issues@versioncontrol
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2008-02-14 14:51 UTC by John Rice
Modified: 2008-02-20 21:04 UTC (History)
1 user (show)

See Also:
Issue Type: ENHANCEMENT
:


Attachments
mercurial-backout-strip-update-revert.jpg (134.44 KB, image/jpeg)
2008-02-14 22:51 UTC, John Rice
Details
Rework of update, revert, adding Strip, Backout main_work_67893_3aef657fdd9c-127399-update-and-others-rev1.patch (167.19 KB, text/plain)
2008-02-20 14:58 UTC, John Rice
Details

Note You need to log in before you can comment on or make changes to this bug.
Description John Rice 2008-02-14 14:51:16 UTC
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.
Comment 1 John Rice 2008-02-14 22:51:12 UTC
Created attachment 56702 [details]
mercurial-backout-strip-update-revert.jpg
Comment 2 John Rice 2008-02-14 22:52:13 UTC
Trying to rationalize the various dialogs and make them consistent in how they work and what they tell the user - see
attachment.
Comment 3 Padraig Obriain 2008-02-20 08:50:35 UTC
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.
Comment 4 Maros Sandor 2008-02-20 09:11:27 UTC
I do not understand the question. And what wiki page are you referring to?
Comment 5 Padraig Obriain 2008-02-20 09:14:26 UTC
Sorry. wrong bug.
Comment 6 John Rice 2008-02-20 14:58:42 UTC
Created attachment 56929 [details]
Rework of update, revert, adding Strip, Backout main_work_67893_3aef657fdd9c-127399-update-and-others-rev1.patch
Comment 7 John Rice 2008-02-20 21:04:05 UTC
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$ 


By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo