Mercurial > hg
view tests/test-merge5 @ 2629:a49534aac47d
context.py: various fixes
- use a normal changeset instead of a context
- define _filenode instead of _node to match the else clause
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 16 Jul 2006 16:40:24 +0200 |
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