Mercurial > hg
view tests/test-commit-unresolved.t @ 11949:626fe5c99231
hgfixes: added a fixer to convert changes in the email package
This patch adds a fixer that accounts for changes in python packages, as the
framework provided by lib2to3 is only able to track changes in module names.
This fixer (hopefully) can fix any change in one-level hierarchies.
To exemplify, this fixer can successfully change an import from
"email.MIMEMultipart" to "email.mime.multipart".
author | Renato Cunha <renatoc@gmail.com> |
---|---|
date | Sun, 08 Aug 2010 15:48:58 -0300 |
parents | 6c24465613de |
children | f2daa6ab514a |
line wrap: on
line source
$ echo "[extensions]" >> $HGRCPATH $ echo "graphlog=" >> $HGRCPATH $ addcommit () { > echo $1 > $1 > hg add $1 > hg commit -d "${2} 0" -m $1 > } $ commit () { > hg commit -d "${2} 0" -m $1 > } $ hg init a $ cd a $ addcommit "A" 0 $ addcommit "B" 1 $ echo "C" >> A $ commit "C" 2 $ hg update -C 0 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo "D" >> A $ commit "D" 3 created new head Merging a conflict araises $ hg merge merging A warning: conflicts during merge. merging A failed! 1 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon Correct the conflict without marking the file as resolved $ echo "ABCD" > A $ hg commit -m "Merged" abort: unresolved merge conflicts (see hg resolve) Mark the conflict as resolved and commit $ hg resolve -m A $ hg commit -m "Merged" $ exit 0