Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-default @ 3239:6d98149d70fe
contexts: add working dir and working file contexts
add workingctx
add workingfilectx
extend filectx.annotate for rev=None
extend filectx.ancestor
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 02 Oct 2006 22:03:14 -0500 |
parents | 013921c753bd |
children | 9cd6578750b9 |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg commit -A -ma echo a >> a hg commit -mb echo a >> a hg commit -mc hg up 1 echo a >> a hg commit -md hg up 1 echo a >> a hg commit -me hg up 1 echo % should fail because not at a head hg merge hg up echo % should fail because \> 2 heads hg merge echo % should succeed hg merge 2 hg commit -mm1 echo % should succeed - 2 heads hg merge hg commit -mm2 echo % should fail because 1 head hg merge true