Mercurial > hg
view tests/test-manifest-merging.t @ 12668:89e35377dbe8
test-subrepo-svn.t: ignore that subversion %-encodes $TESTTMP
Use a glob instead of expecting $TESTTMP.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Sat, 09 Oct 2010 15:06:22 -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