Mercurial > hg
view tests/test-manifest-merging.t @ 16293:bc1d949261c4 stable
phases: fix a non-standard debug message
- add missing newline
- ditch gratuitous use of string formatting with dict
- fix so it actually does string formatting ('%' rather than ',')
- inline unnecessary local variable
- downcase first word
author | Greg Ward <greg@gerg.ca> |
---|---|
date | Wed, 15 Feb 2012 17:30:21 -0500 |
parents | e5aee120287b |
children | f2719b387380 |
line wrap: on
line source
$ hg init base $ cd base $ echo 'alpha' > alpha $ hg ci -A -m 'add alpha' adding alpha $ cd .. $ hg clone base work updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd work $ echo 'beta' > beta $ hg ci -A -m 'add beta' adding beta $ cd .. $ cd base $ echo 'gamma' > gamma $ hg ci -A -m 'add gamma' adding gamma $ cd .. $ cd work $ hg pull -q $ hg merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) Update --clean to revision 1 to simulate a failed merge: $ rm alpha beta gamma $ hg update --clean 1 2 files updated, 0 files merged, 0 files removed, 0 files unresolved