Mercurial > hg
view tests/test-commit-unresolved.t @ 14723:b9faf94ee196 stable
revset: fix aliases with 0 or more than 2 parameters
The existing code seemed to have incorrect assumptions about how parameter
lists are represented by the parser.
Now the match and replace functions have been merged and simplified by using
getlist().
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 22 Jun 2011 01:55:00 +0200 |
parents | 919174c0aaff |
children | 2371f4aea665 |
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 [1] Correct the conflict without marking the file as resolved $ echo "ABCD" > A $ hg commit -m "Merged" abort: unresolved merge conflicts (see hg help resolve) [255] Mark the conflict as resolved and commit $ hg resolve -m A $ hg commit -m "Merged"