Mercurial - Source Control Management: Difference between revisions
No edit summary |
|||
| (One intermediate revision by the same user not shown) | |||
| Line 1: | Line 1: | ||
{{Source Control}} | |||
<google>ENGELSK</google> | <google>ENGELSK</google> | ||
| Line 37: | Line 35: | ||
If a graft merge results in conflicts, the graft process is interrupted so that the current merge can be manually resolved. Once all conflicts are addressed, the graft process can be continued with the -c/--continue option. | If a graft merge results in conflicts, the graft process is interrupted so that the current merge can be manually resolved. Once all conflicts are addressed, the graft process can be continued with the -c/--continue option. | ||
====Rollback==== | |||
One-level undo. Will undo the last pull or commit (can be dangerous) | |||
====Backout==== | |||
Create a new commit that is the inverse of a given commit.<br> | |||
Net effect is an undo, but the change remains in your history. | |||
====Strip==== | |||
Remove (destroy) changes from history.<br> | |||
Removing a changeset also removes all of its children, so it can only be used to truncate history, not remove a slice. | |||
====Update==== | |||
If you want to undo a Merge that is not already committed (because you cancelled it) you can Update to the last revision. It will give you an option to revert changes not already committed. | |||
Latest revision as of 12:50, 7 December 2016
<google>ENGELSK</google>
Mercurial SCM - Source Control Management
- Mercurila - Wikipedia
- Hg Init: a Mercurial tutorial
- Turnkey - Revision Control Appliance - All-in-one code repository
mercurial.selenic.com
The convert extension converts repositories from other SCMs (or even Mercurial itself) into Mercurial repositories.
Eclipse and Mercurial
- MercurialEclipse (was: HgEclipse)
- MercurialEclipse - JavaForge
- DVCS part 2: initialize and import from local Repositories (EGit – HgEclipse)
Visual Studio and Mercurial
TortoiseHg
TortoiseHg Workbench
Graft
copy changes from other branches onto the current branch
This command uses Mercurial's merge logic to copy individual changes from other branches without merging branches in the history graph. This is sometimes known as 'backporting' or 'cherry-picking'. By default, graft will copy user, date, and description from the source changesets.
Changesets that are ancestors of the current revision, that have already been grafted, or that are merges will be skipped.
If a graft merge results in conflicts, the graft process is interrupted so that the current merge can be manually resolved. Once all conflicts are addressed, the graft process can be continued with the -c/--continue option.
Rollback
One-level undo. Will undo the last pull or commit (can be dangerous)
Backout
Create a new commit that is the inverse of a given commit.
Net effect is an undo, but the change remains in your history.
Strip
Remove (destroy) changes from history.
Removing a changeset also removes all of its children, so it can only be used to truncate history, not remove a slice.
Update
If you want to undo a Merge that is not already committed (because you cancelled it) you can Update to the last revision. It will give you an option to revert changes not already committed.