Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5 @ 2252:ba7afc7dd901
Added tag 0.9 for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 10 May 2006 16:55:55 -0500 |
parents | 39eb64b23cb5 |
children | 41989e55fa37 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo This is file a1 > a echo This is file b1 > b hg add a b hg commit -m "commit #0" -d "1000000 0" echo This is file b22 > b hg commit -m"comment #1" -d "1000000 0" hg update 0 rm b hg commit -A -m"comment #2" -d "1000000 0" # in theory, we shouldn't need the "-y" below, but it prevents # this test from hanging when "hg update" erroneously prompts the # user for "keep or delete" hg update -y 1 exit 0