equal
deleted
inserted
replaced
2070 of the form:: |
2070 of the form:: |
2071 |
2071 |
2072 (grafted from CHANGESETHASH) |
2072 (grafted from CHANGESETHASH) |
2073 |
2073 |
2074 If --force is specified, revisions will be grafted even if they |
2074 If --force is specified, revisions will be grafted even if they |
2075 are already ancestors of or have been grafted to the destination. |
2075 are already ancestors of, or have been grafted to, the destination. |
2076 This is useful when the revisions have since been backed out. |
2076 This is useful when the revisions have since been backed out. |
2077 |
2077 |
2078 If a graft merge results in conflicts, the graft process is |
2078 If a graft merge results in conflicts, the graft process is |
2079 interrupted so that the current merge can be manually resolved. |
2079 interrupted so that the current merge can be manually resolved. |
2080 Once all conflicts are addressed, the graft process can be |
2080 Once all conflicts are addressed, the graft process can be |
3073 def incoming(ui, repo, source="default", **opts): |
3073 def incoming(ui, repo, source="default", **opts): |
3074 """show new changesets found in source |
3074 """show new changesets found in source |
3075 |
3075 |
3076 Show new changesets found in the specified path/URL or the default |
3076 Show new changesets found in the specified path/URL or the default |
3077 pull location. These are the changesets that would have been pulled |
3077 pull location. These are the changesets that would have been pulled |
3078 if a pull at the time you issued this command. |
3078 by :hg:`pull` at the time you issued this command. |
3079 |
3079 |
3080 See pull for valid source format details. |
3080 See pull for valid source format details. |
3081 |
3081 |
3082 .. container:: verbose |
3082 .. container:: verbose |
3083 |
3083 |
3806 With no argument, show the phase name of the current revision(s). |
3806 With no argument, show the phase name of the current revision(s). |
3807 |
3807 |
3808 With one of -p/--public, -d/--draft or -s/--secret, change the |
3808 With one of -p/--public, -d/--draft or -s/--secret, change the |
3809 phase value of the specified revisions. |
3809 phase value of the specified revisions. |
3810 |
3810 |
3811 Unless -f/--force is specified, :hg:`phase` won't move changeset from a |
3811 Unless -f/--force is specified, :hg:`phase` won't move changesets from a |
3812 lower phase to an higher phase. Phases are ordered as follows:: |
3812 lower phase to a higher phase. Phases are ordered as follows:: |
3813 |
3813 |
3814 public < draft < secret |
3814 public < draft < secret |
3815 |
3815 |
3816 Returns 0 on success, 1 if some phases could not be changed. |
3816 Returns 0 on success, 1 if some phases could not be changed. |
3817 |
3817 |