Mercurial > hg

view tests/test-symlink-os-yes-fs-no.py.out @ 38667:572dff5c946e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: add --confirm option This feature adds a functionality in rebase to confirm before applying changes. When there is no conflict and user confirm to apply actions, we just finish the unfinished rebase. But when there is a conflict and user confirm to apply actions then we can't just finish rebasing using rbsrt._finishrebase() because in-memory merge doesn't support conflicts, so we have to abort and run on-disk merge in this case. And if user doesn't confirm to apply actions then simply abort the rebase. Differential Revision: https://phab.mercurial-scm.org/D3870
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 30 Jun 2018 12:42:49 +0530
parents 5ac84b20f184
children 89630d0b3e23
line wrap: on
line source

adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
new changesets d326ae2d01ee
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding changesets
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
new changesets d326ae2d01ee
4 files updated, 0 files merged, 0 files removed, 0 files unresolved