version 1.11, 2014/12/14 09:51:06
|
version 1.12, 2014/12/14 09:52:59
|
Line 65 committed, you need to do an explicit me
|
Line 65 committed, you need to do an explicit me
|
push. |
push. |
|
|
In the simple case, you do an explicit merge as follows: |
In the simple case, you do an explicit merge as follows: |
|
|
hg pull |
hg pull |
hg merge |
hg merge |
hg commit |
hg commit |
Line 72 In the simple case, you do an explicit m
|
Line 73 In the simple case, you do an explicit m
|
When you get a merge conflict, you first need to resolve it (in the |
When you get a merge conflict, you first need to resolve it (in the |
usual way by editing) and then you must tag it resolved in hg before |
usual way by editing) and then you must tag it resolved in hg before |
hg will let you commit, like this: |
hg will let you commit, like this: |
|
|
hg resolve -m file |
hg resolve -m file |
|
|
You can list unresolved conflicts thus: |
You can list unresolved conflicts thus: |
|
|
hg resolve -l |
hg resolve -l |
|
|
Note that even with the explicit merge this is almost exactly |
Note that even with the explicit merge this is almost exactly |
Line 86 that touches the same files you've edite
|
Line 89 that touches the same files you've edite
|
There is one gotcha, which is that you can't do explicit merges in a |
There is one gotcha, which is that you can't do explicit merges in a |
tree with uncommitted changes. The best way around this is to stash |
tree with uncommitted changes. The best way around this is to stash |
your changes: |
your changes: |
|
|
hg stash |
hg stash |
hg merge |
hg merge |
...whatever merge stuff... |
...whatever merge stuff... |
Line 122 push, pull, incoming, and outgoing.
|
Line 126 push, pull, incoming, and outgoing.
|
A commit with no descendents (that is, the most recent commit on any |
A commit with no descendents (that is, the most recent commit on any |
line of development) is called a "head". |
line of development) is called a "head". |
You can list these as follows: |
You can list these as follows: |
|
|
hg heads |
hg heads |
|
|
This will include commits that have descendents only on other |
This will include commits that have descendents only on other |
Line 134 incoming" and "hg outgoing" respectively
|
Line 139 incoming" and "hg outgoing" respectively
|
|
|
If you interrupt Mercurial (or Mercurial gets interrupted, e.g. by a |
If you interrupt Mercurial (or Mercurial gets interrupted, e.g. by a |
system crash) you want to do this afterwards: |
system crash) you want to do this afterwards: |
|
|
hg recover |
hg recover |
|
|
and if you have reason to think the repository might be corrupt you |
and if you have reason to think the repository might be corrupt you |
can check it like this: |
can check it like this: |
|
|
hg verify |
hg verify |
|
|
### Development branches |
### Development branches |
Line 173 warning is aimed at git users who ought
|
Line 180 warning is aimed at git users who ought
|
instead and not something you need to be concerned about. |
instead and not something you need to be concerned about. |
|
|
Check out a new tree on a branch: |
Check out a new tree on a branch: |
|
|
cvs co -P -rlibc13 hg clone [url] |
cvs co -P -rlibc13 hg clone [url] |
cd src |
cd src |
hg update -r libc13 |
hg update -r libc13 |
|
|
Switch to a new tree on a branch: |
Switch to a new tree on a branch: |
|
|
cvs up -dP -A -rlibc13 hg pull (if needed) |
cvs up -dP -A -rlibc13 hg pull (if needed) |
hg update -r libc13 |
hg update -r libc13 |
|
|
Line 185 Note that if you have uncommitted change
|
Line 194 Note that if you have uncommitted change
|
crossing from one branch to another because it doesn't know how to |
crossing from one branch to another because it doesn't know how to |
merge them. |
merge them. |
In that case do this: |
In that case do this: |
|
|
hg update -r libc13-base |
hg update -r libc13-base |
[resolve conflicts if needed] |
[resolve conflicts if needed] |
hg update -r libc13 |
hg update -r libc13 |
Line 403 local modification until whatever issue
|
Line 413 local modification until whatever issue
|
sorted out. |
sorted out. |
|
|
To revert to a specific version: |
To revert to a specific version: |
|
|
hg revert -r rev subtree |
hg revert -r rev subtree |
To revert to a specific date: |
To revert to a specific date: |
|
|
hg revert -d date subtree |
hg revert -d date subtree |
|
|
|
|