Mercurial tortoisehg tutorial update#
Mercurial tortoisehg tutorial Patch#
Mercurial tortoisehg tutorial code#
Mercurial tortoisehg tutorial series#

This has the drawback that any commit message might be lost. Commit the local changes in a 'fresh' changeset.

Mercurial tortoisehg tutorial update#

Update to the new tip (maybe in incremental steps).

In the dialog, select 'Do not modify working copy during strip (-k/-keep)'.

Before updating to the new tip, strip the local changes by selecting 'Modify History' -> 'Strip.' from the right click menu.

Pull changes from the upstream repository.

The ways described here might not be the most elegant ones. Sometimes a change in the upstream repository might make it necessary to rebase a changeset to a new parent.

Mercurial tortoisehg tutorial Patch#

Finish the patch by selecting 'Modify History' -> 'Finish Patch' from the right click menu of the respective changeset. After updating some local files or changing the commit message, hit the 'QRefresh' button. For this, select 'Modify History' -> 'Import to MQ' in the right click menu of the respective changeset. The most useful feature of that extension is probably to update an existing changeset. To activate the 'mq' extension in TortoiseSVN, open the settings, select 'Extensions' on the global settings tab and activate the checkbox next to 'mq'. The 'mq' extension does *not* allow to modify pushed changes. It also allows to rebase changes to a new parent or to strip changes completely. The 'mq' extension allows to modify (local) changesets after they have been committed. That might make it easier to get used to working with Mercurial. It allows to perform many hg operations using the context menu and toolbar buttons. TortoiseHg is a multi-platform graphical user interface for Mercurial repositories. username = Your Name color = histedit = pager = rebase = strip = pager = LESS='FSRX' less attend = help, annotate, cat, diff, export, glog, log, outgoing, incoming showfunc = True mode = terminfo # Custom colors ay = 244 color.orange = 202 color.lightyellow = 191 color.darkorange = 220 color.brightyellow = 226 status.modified = magenta bold status.added = green bold status.removed = red bold leted = cyan bold status.unknown = gray bold status.ignored = gray bold # Colors for each label log.branch = cyan log.summary = lightyellow log.description = lightyellow log.bookmark = green log.tag = darkorange log.graph = blue # Colors for each phase cret = blue bold changeset.draft = red bold changeset.public = orange desc.here = bold blue_background track.current = True glog = log -graph top = log -graph -l Tips for working with TortoiseHg They are a 'lightweight' solution to named branches, which are not automatically updated for example.

Mercurial tortoisehg tutorial series#

In this section we use for example /octave.īookmarks are useful for identifying a series of commits. Students should publish their work as it progresses in a public repository.

Mercurial tortoisehg tutorial code#

This section is meant to provide tips for Summer of Code students working on new Octave features. If your patch file is larger than the upload limit, you can compress it before uploading. Upload bug42424.patch to the bug or patch tracker.# Take action depending on help text format = get_help_text (name) + = get_better_help_text (name) * scripts/help/help.m: Describe what you changed to display relevant topicsįirst.

Help.m: Display relevant topics first (bug #42424) Make sure that your changes don't introduce new bugs! Thus it is recommended to build Octave and to run Octave's test suite before proceeding.

Make your changes (fix bug #42424) and save them.

Get the latest version of Octave (or some Octave package) hg clone or when already cloned hg pull & hg update.

You have to generate a patch (or changeset) so other Octave developers can include them into Octave's source code. If you want to share your modifications, for example to fix a nasty bug #42424, you cannot just submit your changes to Octave's main repository.

2.2 Staying up-to-date with the main repositoryĬreating and submitting patches (changesets).

1 Creating and submitting patches (changesets).