|
Size: 2369
Comment: update to mercurial 1.6
|
Size: 863
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| == Shelve Extension == | #pragma section-numbers 2 = Shelve Extension = |
| Line 3: | Line 4: |
| '''This extension is not distributed with Mercurial.''' | '''This extension is distributed with Mercurial 2.8 and later.''' |
| Line 5: | Line 6: |
| ''Author: TK Soh <teekaysoh@gmail.com>'' | ''Author: Bryan O'Sullivan'' |
| Line 7: | Line 8: |
| Repository: [[http://bitbucket.org/tksoh/hgshelve/]] | ''Current maintainer: Facebook'' |
| Line 9: | Line 10: |
| === Overview === | <<TableOfContents>> |
| Line 11: | Line 12: |
| The shelve extension provides the `shelve` command to lets you choose which parts of the changes in a working directory you'd like to set aside temporarily, at the granularity of patch hunks. You can later restore the shelved patch hunks using the `unshelve` command. | == Overview == |
| Line 13: | Line 14: |
| The shelve extension has been adapted from Mercurial's RecordExtension. | The shelve extension lets you set the changes in your working directory aside temporarily and restore them. |
| Line 15: | Line 16: |
| === Compatibility with Mercurial === | == Configuration == |
| Line 17: | Line 18: |
| || '''Mercurial''' || '''Shelve Extension''' || || 1.6 and later || [[http://bitbucket.org/tksoh/hgshelve/changeset/41e13e800fb6/|41e13e800fb6]] or later|| || 1.5.x and later || [[http://bitbucket.org/tksoh/hgshelve/changeset/d95c583611f8/|d95c583611f8]] or later|| || 1.4.x and later || [[http://bitbucket.org/tksoh/hgshelve/changeset/276d8083dc3b/|276d8083dc3b]] or later|| || 1.3.x || [[http://bitbucket.org/tksoh/hgshelve/changeset/18815655993b/|18815655993b]] or later|| || 1.1.x - 1.2.x || [[http://bitbucket.org/tksoh/hgshelve/changeset/7090a3ed2da7/|7090a3ed2da7]] || || < 1.1.x || [[http://bitbucket.org/tksoh/hgshelve/changeset/ef85a6331d31/|ef85a6331d31]] || === Configuration === Configure your .hgrc to enable the extension by adding following lines: |
Configure your ''`.hgrc`'' to enable the extension by adding following lines: |
| Line 31: | Line 22: |
| hgshelve=/path/to/hgshelve.py | shelve= |
| Line 34: | Line 25: |
| or place hgshelve.py in your 'hgext' directory and add the following lines: {{{ [extensions] hgext.hgshelve= }}} If you use the win32text extension, make sure you have the following lines in your .hgrc or mercurial.ini. This enables automatic line-ending translation when applying patches. {{{ [patch] eol = auto }}} === Usage === |
== Usage == |
| Line 56: | Line 33: |
| Temporarily stash away changes. You can select the exact hunks of changes you want to shelve. | Temporarily stash away changes. {{{ hg shelve --list }}} List all existing shelves. |
| Line 62: | Line 45: |
| Get the changes back into the workdir. | Get the changes back into the working directory. |
| Line 64: | Line 47: |
| == See also == * ThirdPartyShelveExtension * AtticExtension * [[/Talk|Talk]] page |
|
| Line 65: | Line 52: |
| === Hunks selection === {{{ y - shelve this change n - skip this change s - skip remaining changes to this file f - shelve remaining changes to this file d - done, skip remaining changes and files a - shelve all changes to all remaining files q - quit, shelveing no changes ? - display help }}} |
|
| Line 81: | Line 53: |
| CategoryExtensionsByOthers | CategoryBundledExtension |
Shelve Extension
This extension is distributed with Mercurial 2.8 and later.
Author: Bryan O'Sullivan
Current maintainer: Facebook
Contents
1. Overview
The shelve extension lets you set the changes in your working directory aside temporarily and restore them.
2. Configuration
Configure your .hgrc to enable the extension by adding following lines:
[extensions] shelve=
3. Usage
(this is only a description of the basic usage)
hg shelve
Temporarily stash away changes.
hg shelve --list
List all existing shelves.
hg unshelve
Get the changes back into the working directory.